David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
arm
clk
clock	GMAC: define clock ID used for GMAC	2014-12-31 19:14:18 -05:00
dma
gpio
input
interrupt-controller	ARM: dt: GIC: Spelling s/specific/specifier/, s/flaggs/flags/	2015-01-13 13:48:16 -06:00
memory
mfd
phy
pinctrl
pwm
regulator
reset
reset-controller
soc
sound
spmi
thermal	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc	2014-12-21 22:49:12 +08:00