David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/sfc/rx.c Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change the rx_buf->is_page boolean into a set of u16 flags, and another to adjust how ->ip_summed is initialized. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-02-26 21:55:51 -05:00
..
appldata	sched/accounting: Change cpustat fields to an array	2011-12-06 09:06:38 +01:00
boot	[S390] Remove Kerntypes leftovers	2011-12-27 11:27:12 +01:00
crypto	[S390] crypto: avoid MSA3 and MSA4 instructions in ESA mode	2011-11-14 11:19:09 +01:00
hypfs	vfs: switch ->show_options() to struct dentry *	2012-01-06 23:19:54 -05:00
include/asm	net: Add framework to allow sending packets with customized CRC.	2012-02-24 01:37:35 -08:00
kernel	sys_poll: fix incorrect type for 'timeout' parameter	2012-02-21 17:24:20 -08: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] incorrect PageTables counter for kvm page tables	2012-02-17 10:29:33 +01:00
oprofile	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 08:02:58 -08:00
defconfig	[S390] defconfig: switch on CONFIG_DEVTMPFS	2011-10-30 15:16:42 +01:00
Kbuild	[S390] make arch/s390 subdirectories depend on config option	2011-12-27 11:27:12 +01:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2012-01-09 08:11:13 -08:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	[S390] cleanup entry point definition	2012-01-18 18:03:41 +01:00