tree c71490983f37d74067c90a7e29055a2d0cf3d9ed
parent 4bdc1b96504f5f562b129afd48ca03d79aeb1fd9
parent 1ac00cc21337b0b667493d9af79d88537de90aa3
author Linus Torvalds <torvalds@linux-foundation.org> 1235688325 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235688325 -0800

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/44x: Fix address decoding setup of PCI 2.x cells