Ingo Molnar daab7fc734 Merge commit 'v2.6.36-rc3' into x86/memblock ... Conflicts: arch/x86/kernel/trampoline.c mm/memblock.c Merge reason: Resolve the conflicts, update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-08-31 09:45:46 +02:00
..
boot	Merge branch 'master' into for-next	2010-06-16 18:08:13 +02:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
include/asm	Merge commit 'v2.6.36-rc3' into x86/memblock	2010-08-31 09:45:46 +02:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-08-28 13:55:31 -07:00
lib	sparc64: Make lock backoff really a NOP on UP builds.	2010-08-18 22:53:26 -07:00
math-emu	Revert "endian: #define __BYTE_ORDER"	2010-05-26 08:30:15 -07:00
mm	Merge commit 'v2.6.36-rc3' into x86/memblock	2010-08-31 09:45:46 +02:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc64: Get rid of indirect p1275 PROM call buffer.	2010-08-23 23:10:57 -07:00
Kconfig	Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-06 13:18:29 -07:00
Kconfig.debug	sparc: Kill user copy check code.	2010-08-09 00:45:46 -07:00
Makefile	sparc: Set UTS_MACHINE correctly.	2009-12-05 17:17:55 -08:00