]> git.baikalelectronics.ru Git - kernel.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)
commit5f667d4c5631936b95aa92c4ab13b147f9359a34
treec25f19a0ae1f7cb75319b585c1d473cfed463f22
parent1b086e107d6ac62ada60098ae2c9f1adb88f3458
parent0c5a32dd856d81b70f86c2e140523187e8587ce2
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