David S. Miller 17f7f4d9fc Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/ipv4/fib_frontend.c		2010-12-26 22:37:05 -08:00
..
appldata	[S390] appldata: fix dev_get_stats 64 bit conversion	2010-08-13 10:06:55 +02:00
boot	[S390] Add support for LZO-compressed kernels.	2010-05-26 23:27:10 +02:00
crypto	[S390] cleanup facility list handling	2010-10-25 16:10:21 +02:00
hypfs	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2010-10-29 08:49:18 -07:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-26 22:37:05 -08:00
kernel	[S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus	2010-12-01 10:08:17 +01:00
kvm	[S390] cleanup facility list handling	2010-10-25 16:10:21 +02:00
lib	[S390] nmi: fix clock comparator revalidation	2010-11-25 09:52:59 +01:00
math-emu	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
mm	[S390] fix get_user_pages_fast	2010-11-10 10:05:53 +01:00
oprofile	Combine instrumentation menus in kernel/Kconfig.instrumentation	2007-10-19 11:53:54 -07:00
defconfig	defconfig reduction	2010-08-14 22:26:53 +02:00
Kbuild	[S390] standardize Kbuild rules	2010-10-25 16:10:14 +02:00
Kconfig	[S390] ftrace: select HAVE_C_RECORDMCOUNT	2010-10-29 16:50:50 +02:00
Kconfig.debug	[S390] mm: add devmem_is_allowed() for STRICT_DEVMEM checking	2010-11-10 10:05:54 +01:00
Makefile	[S390] Add config option for z196 code generation.	2010-10-25 16:10:15 +02:00