David Woodhouse 67577927e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ... Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>		2010-10-30 12:35:11 +01:00
..
boot	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-10-21 21:19:54 -07:00
configs	Merge remote branch 'jwb/next' into next	2010-10-15 10:45:03 +11:00
include/asm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
kernel	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-10-25 08:19:14 -07:00
kvm	Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-10-24 12:47:25 -07:00
lib	powerpc/Makefiles: Change to new flag variables	2010-10-13 16:19:22 +11:00
math-emu	powerpc/Makefiles: Change to new flag variables	2010-10-13 16:19:22 +11:00
mm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-10-21 21:19:54 -07:00
oprofile	oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt.	2010-10-14 00:53:05 -05:00
platforms	Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-10-24 12:47:25 -07:00
sysdev	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
xmon	powerpc/Makefiles: Change to new flag variables	2010-10-13 16:19:22 +11:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
Kconfig.debug	powerpc: Unconditionally enabled irq stacks	2010-06-15 15:02:37 +10:00
Makefile	powerpc: Fix typo in uImage target	2010-08-24 15:26:32 +10:00
relocs_check.pl	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	2009-09-24 15:31:40 +10:00