David S. Miller e548833df8 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/mac80211/main.c		2010-09-09 22:27:33 -07: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	crypto: des_s390 - Checkpatch cleanup	2010-05-26 10:41:03 +10:00
hypfs	switch hypfs to ->evict_inode()	2010-08-09 16:47:50 -04:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-09 22:27:33 -07:00
kernel	[S390] fix tlb flushing vs. concurrent /proc accesses	2010-08-24 09:26:34 +02:00
kvm	KVM: Remove memory alias support	2010-08-01 10:47:00 +03:00
lib	[S390] uaccess: make sure copy_from_user_overflow is builtin	2010-03-08 12:25:29 +01:00
math-emu	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
mm	[S390] fix tlb flushing vs. concurrent /proc accesses	2010-08-24 09:26:34 +02: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
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug	[S390] uaccess: implement strict user copy checks	2010-02-26 22:37:29 +01:00
Makefile	Merge commit 'v2.6.35' into kbuild/kbuild	2010-08-04 13:59:13 +02:00