Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Feb 2009 22:45:25 +0000 (14:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Feb 2009 22:45:25 +0000 (14:45 -0800)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/44x: Fix address decoding setup of PCI 2.x cells


Trivial merge