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
..
alpha	alpha: fix build failures from system.h dismemberment	2012-04-13 13:15:16 -04:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
avr32
blackfin	blackfin: fix ifdef fustercluck in mach-bf538/boards/ezkit.c	2012-04-26 14:46:51 -04:00
c6x	irq: Kill pointless irqd_to_hw export	2012-04-10 22:39:17 -06:00
cris
frv
h8300
hexagon	hexagon: add missing cpu.h include	2012-04-23 12:57:24 -05:00
ia64	kill mm argument of vm_munmap()	2012-04-21 01:58:20 -04:00
m32r
m68k	m68knommu: make sure 2nd FEC eth interface pins are enabled on 5275 ColdFire	2012-04-17 17:06:34 +10:00
microblaze
mips	MIPS: Remove get_current_pgd().	2012-04-27 17:16:29 +01:00
mn10300
openrisc
parisc
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-03 17:10:39 -07:00
s390	[S390] Fix compile error in swab.h	2012-04-11 14:28:26 +02:00
score
sh	sh: Fix up tracepoint build fallout from static key introduction.	2012-04-27 11:12:38 +09:30
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-23 23:15:17 -04:00
tile	arch/tile: fix a couple of functions that should be __init	2012-04-25 12:45:26 -04:00
um
unicore32
x86	Very good bug-fixes:	2012-04-27 19:56:22 -07:00
xtensa	xtensa: fix build fail on undefined ack_bad_irq	2012-04-26 18:35:32 -04:00
.gitignore
Kconfig