]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 18 Feb 2009 02:19:25 +0000 (13:19 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 18 Feb 2009 02:19:25 +0000 (13:19 +1100)
commit82a0a1cc8f94bc59e5919715bc03fc8353fa770d
treec25f19a0ae1f7cb75319b585c1d473cfed463f22
parent8d30c14cab30d405a05f2aaceda1e9ad57800f36
parent5955c7a2cfb6a35429adea5dc480002b15ca8cfc
Merge commit 'origin/master' into next

Manual merge of:
arch/powerpc/include/asm/pgtable-ppc32.h
arch/powerpc/include/asm/pgtable-ppc32.h
arch/powerpc/mm/numa.c
drivers/watchdog/Kconfig
include/linux/pci_ids.h