tree 575a714f55e6b05443c182df2673392ea2865fea
parent 7d620a4e531ae4d432d3c88f7d4b75327d881a87
parent 545da94f924d52f80e2bbea99a8652f454889a2b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1170017122 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1170017122 -0800

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