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	dt: bindings: ux500: Add header for PM domains specifiers	2014-10-28 10:47:57 +01:00
clk	Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next	2014-06-10 16:53:25 -07:00
clock	GMAC: define clock ID used for GMAC	2014-12-31 19:14:18 -05:00
dma	dmaengine: at_xdmac: creation of the atmel eXtended DMA Controller driver	2014-11-06 11:00:08 +05:30
gpio	ARM: tegra: add port FF to GPIO IDs	2013-12-16 14:09:16 -07:00
input	Input: drv260x - add TI drv260x haptics driver	2014-08-19 22:19:28 -07:00
interrupt-controller	ARM: dt: GIC: Spelling s/specific/specifier/, s/flaggs/flags/	2015-01-13 13:48:16 -06:00
memory	memory: Add NVIDIA Tegra memory controller support	2014-12-04 16:11:47 +01:00
mfd	== Changes to existing drivers ==	2014-08-07 17:17:39 -07:00
phy	phy: add support for USB cluster on the Armada 375 SoC	2014-11-26 11:07:14 +05:30
pinctrl	Pin control changes for the v3.19 series:	2014-12-11 10:43:14 -08:00
pwm	pwm: Add PWM polarity flag macro for DT	2013-09-03 13:08:09 +02:00
regulator	regulator: max77802: Add header for operating modes	2014-10-20 12:23:50 +01:00
reset	clk: qcom: Add support for APQ8064 multimedia clocks	2014-07-15 16:39:03 -07:00
reset-controller	reset: stih407: Add reset controllers DT bindings	2014-10-31 09:47:54 +01:00
soc	soc: qcom: Add device tree binding for GSBI	2014-05-23 11:38:53 -05:00
sound	ASoC: cs35l32: Add support for CS35L32 Boosted Amplifier	2014-08-16 17:03:22 -05:00
spmi	spmi: Linux driver framework for SPMI	2014-02-15 11:55:28 -08:00
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