Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 29 May 2009 03:54:52 +0000 (13:54 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 29 May 2009 03:54:52 +0000 (13:54 +1000)
commit435462c6e639065460e91903d6bd2af0f5762fde
treebf66ccdd613019035ebab535762366aa1026399b
parentd7b41b1fdf162d3e26cb73bf2cf14816918e371e
parentb5c42bc8db17db80917f99205a03c51f17354495
Merge branch 'merge' into next
Documentation/kernel-parameters.txt
arch/powerpc/Kconfig
include/linux/pci_ids.h