David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The forcedeth changes had a conflict with the conversion over to atomic u64 statistics in net-next. The libertas cfg.c code had a conflict with the bss reference counting fix by John Linville in net-next. Conflicts: drivers/net/ethernet/nvidia/forcedeth.c drivers/net/wireless/libertas/cfg.c		2011-11-21 13:50:33 -05:00
..
appldata	[S390] mm: add ZONE_DMA to 31-bit config again	2011-05-26 09:48:25 +02:00
boot	[S390] sparse: fix sparse static warnings	2011-10-30 15:16:46 +01:00
crypto	[S390] crypto: avoid MSA3 and MSA4 instructions in ESA mode	2011-11-14 11:19:09 +01:00
hypfs	filesystems: add set_nlink()	2011-11-02 12:53:43 +01:00
include/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
kernel	[S390] topology: fix topology on z10 machines	2011-11-14 11:19:09 +01:00
kvm	KVM: s390: announce SYNC_MMU	2011-11-17 16:25:52 +02:00
lib	[S390] sparse: fix sparse warnings with __user pointers	2011-10-30 15:16:46 +01:00
math-emu	s390: change to new flag variable	2011-03-17 14:02:57 +01:00
mm	[S390] pfault: ignore leftover completion interrupts	2011-11-14 11:19:08 +01:00
oprofile	[S390] sparse: fix sparse ANSI-C warnings	2011-10-30 15:16:46 +01:00
defconfig	[S390] defconfig: switch on CONFIG_DEVTMPFS	2011-10-30 15:16:42 +01:00
Kbuild	[S390] standardize Kbuild rules	2010-10-25 16:10:14 +02:00
Kconfig	[S390] Kconfig: Select CONFIG_KEXEC for CONFIG_CRASH_DUMP	2011-11-14 11:19:08 +01:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	[S390] remove redundant stack check option	2011-03-15 17:08:22 +01:00