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	microblaze: Do not use _start in vmlinux	2010-08-04 10:22:41 +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 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-18 09:26:17 -07:00
lib	microblaze: Support word copying in copy_tofrom_user	2010-04-01 08:38:25 +02:00
mm	Merge commit 'v2.6.36-rc3' into x86/memblock	2010-08-31 09:45:46 +02:00
oprofile	microblaze: Core oprofile configs and hooks	2009-12-14 08:45:07 +01:00
pci	of: Fix missing includes	2010-08-16 23:44:49 -06:00
platform	microblaze: Use lowest-common-denominator default CPU settings	2009-12-14 08:45:02 +01: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	microblaze: Enable early printk only for uartlite	2010-08-04 10:22:38 +02:00
Makefile	fix typos concerning "hierarchy"	2010-06-16 18:03:14 +02:00