Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
boot	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
configs	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2010-02-28 19:23:06 -08:00
include/asm	Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-03-05 13:12:34 -08:00
kernel	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
kvm	Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-03-05 13:12:34 -08:00
lib	powerpc: Fix lwsync feature fixup vs. modules on 64-bit	2010-02-26 18:29:17 +11:00
math-emu	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00
mm	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
oprofile	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
platforms	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2010-02-28 19:23:06 -08:00
sysdev	Merge commit 'origin/master' into next	2010-02-26 14:41:00 +11:00
xmon	powerpc: Mark some variables in the page fault path __read_mostly	2010-02-03 17:39:48 +11:00
Kconfig	Merge commit 'origin/master' into next	2010-02-26 14:41:00 +11:00
Kconfig.debug	Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6	2009-12-16 13:26:53 -08:00
Makefile	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	2009-09-24 15:31:40 +10:00
relocs_check.pl	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	2009-09-24 15:31:40 +10:00