]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 28 Jan 2007 20:45:22 +0000 (12:45 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 28 Jan 2007 20:45:22 +0000 (12:45 -0800)
commit5263bf65d6342e12ab716db8e529501670979321
tree575a714f55e6b05443c182df2673392ea2865fea
parent7d620a4e531ae4d432d3c88f7d4b75327d881a87
parent545da94f924d52f80e2bbea99a8652f454889a2b
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix sys_pciconfig_iobase bus matching
  [POWERPC] PS3: add not complete comment to kconfig
  [POWERPC] ps3_free_io_irq: Fix inverted error check
  [POWERPC] PS3: Fix uniprocessor kernel build
arch/powerpc/Kconfig