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
..
boot	Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm	2012-04-30 15:34:41 -07:00
common	ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler	2012-04-10 09:27:42 +01:00
configs	Merge branch 'v3.4-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes	2012-04-27 09:40:06 -07:00
include/asm	ARM: 7403/1: tls: remove covert channel via TPIDRURW	2012-04-28 11:01:30 +01:00
kernel	ARM: 7406/1: hotplug: copy the affinity mask when forcefully migrating IRQs	2012-04-28 11:01:31 +01:00
lib
mach-at91	AT91: Remove fixed mapping for AT91RM9200 ethernet	2012-04-28 21:48:37 -04:00
mach-bcmring	ARM: bcmring: fix UART declarations	2012-04-18 21:21:45 -07:00
mach-clps711x
mach-cns3xxx
mach-davinci
mach-dove
mach-ebsa110
mach-ep93xx
mach-exynos	ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability	2012-04-24 17:28:12 -07:00
mach-footbridge
mach-gemini
mach-h720x
mach-highbank
mach-imx	ARM: imx: Fix imx5 idle logic bug	2012-04-18 11:52:24 +02:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-10 14:30:45 -04:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695
mach-l7200/include/mach
mach-lpc32xx
mach-mmp
mach-msm	ARM: msm: Fix gic irqdomain support	2012-04-23 16:13:27 -07:00
mach-mv78xx0
mach-mxs	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
mach-netx
mach-nomadik
mach-omap1	ARM: OMAP1: DMTIMER: fix broken timer clock source selection	2012-04-17 15:30:16 -07:00
mach-omap2	ARM: SoC fixes for 3.4-rc	2012-04-21 12:45:52 -07:00
mach-orion5x
mach-picoxcell
mach-pnx4008
mach-prima2
mach-pxa	ARM: PXA2xx: MFP: fix potential direction bug	2012-04-27 11:14:06 +08:00
mach-realview
mach-rpc
mach-s3c24xx	ARM: S3C24XX: Fix build warning for S3C2410_PM	2012-04-24 13:49:59 -07:00
mach-s3c64xx
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0
mach-s5pc100
mach-s5pv210	ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability	2012-04-24 17:28:12 -07:00
mach-sa1100	arm/sa1100: fix sa1100-rtc memory resource	2012-04-27 11:02:14 +08:00
mach-shark
mach-shmobile	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
mach-spear3xx
mach-spear6xx
mach-tegra
mach-u300	ARM: u300: bump all IRQ numbers by one	2012-04-20 09:52:58 +02:00
mach-ux500	arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file	2012-04-25 21:26:34 -07:00
mach-versatile	ARM: versatile: fix build failure in pci.c	2012-04-02 22:03:35 -07:00
mach-vexpress
mach-vt8500
mach-w90x900
mach-zynq
mm	ARM: 7401/1: mm: Fix section mismatches	2012-04-28 11:00:16 +01:00
net
nwfpe
oprofile
plat-iop
plat-mxc	ARM: 3ds_debugboard: Fix smsc911x driver probe	2012-04-02 11:15:15 +02:00
plat-nomadik
plat-omap	ARM: OMAP: fix DMA vs memory ordering	2012-04-23 16:54:21 +01:00
plat-orion
plat-pxa
plat-s3c24xx
plat-s5p
plat-samsung	ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers	2012-04-20 17:25:46 -07:00
plat-spear
plat-versatile
tools
vfp	ARM: 7400/1: vfp: clear fpscr length and stride bits on entry to sig handler	2012-04-23 15:44:42 +01:00
Kconfig	ARM: 7396/1: errata: only handle ARM erratum #326103 on affected cores	2012-04-23 14:21:52 +01:00
Kconfig-nommu
Kconfig.debug
Makefile