David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
arm	ARM: More device tree support updates	2012-03-28 12:34:33 -07:00
ata	ata: ahci_platform: Add synopsys ahci controller in DT's compatible list	2012-05-03 14:08:53 -04:00
c6x	C6X: devicetree support	2011-10-06 19:47:33 -04:00
crypto	crypto: picoxcell - support for device tree matching	2011-08-10 19:00:26 +08:00
dma	ARM: dt: tegra: Add Tegra APB DMA device tree binding	2012-02-06 18:21:20 -08:00
fb	Fix common misspellings	2011-03-31 11:26:23 -03:00
gpio	GPIO changes for v3.4	2012-03-28 14:08:46 -07:00
hwmon	hwmon: (ads1015) Make gain and datarate configurable	2011-03-21 17:59:37 +01:00
i2c	ARM: device tree work	2012-03-27 16:47:35 -07:00
input	Input: tegra-kbc - revise device tree support	2012-03-13 21:37:07 -07:00
mfd	mfd: Improve mc13xxx dt binding document	2012-01-09 00:37:46 +01:00
mmc	mmc: omap_hsmmc: Convert hsmmc driver to use device tree	2012-03-27 12:20:09 -04:00
mtd	ARM: at91/NAND DT bindings: add comments	2012-04-04 18:35:42 +02:00
net	netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines.	2012-05-07 22:58:09 -04:00
nvec	staging: nvec: add device tree support	2011-11-26 17:17:14 -08:00
pci
pinmux	arm/dt: Tegra: Add pinmux node to tegra20.dtsi	2011-10-11 17:19:56 -07:00
power_supply	max17042_battery: Make it possible to instantiate driver from DT	2012-03-26 20:40:51 +04:00
powerpc	powerpc: document the FSL MPIC message register binding	2012-03-16 16:15:28 -05:00
regulator	regulator: anatop: patching to device-tree property "reg".	2012-03-28 11:52:10 +01:00
rtc	Document: devicetree: add OF documents for arch-mmp	2012-03-07 09:32:52 +08:00
serial	Document: devicetree: add OF documents for arch-mmp	2012-03-07 09:32:52 +08:00
serio	altera_ps2: Add devicetree support	2011-02-15 21:39:21 -07:00
sound	ASoC: fsl: add dt support for imx-audmux	2012-03-06 12:44:21 +00:00
spi	spi/omap: Add DT support to McSPI driver	2012-02-15 12:57:00 -07:00
tty/serial	serial/efm32: add new driver	2012-01-26 11:29:47 -08:00
usb	Merge branch 'for-3.4/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into next/dt2	2012-03-19 20:57:28 +00:00
virtio	virtio: Add platform bus driver for memory mapped virtio device	2011-11-02 11:41:01 +10:30
watchdog	watchdog: imx2_wdt: add device tree probe support	2011-07-26 21:19:16 +00:00
x86	x86: dt: Correct local apic documentation in device tree bindings	2011-02-28 09:58:06 +01:00
eeprom.txt
marvell.txt
open-pic.txt	powerpc: Document the Open PIC device tree binding	2011-03-21 11:00:52 +11:00
resource-names.txt	of/irq: Add interrupts-names property to name an irq resource	2012-01-04 00:33:15 -07:00
vendor-prefixes.txt	Updates of sound stuff for 3.4-rc1	2012-03-22 13:00:13 -07:00
xilinx.txt