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)
commit392b8e47bada8a1068ab0c0bdc44c58726dc395b
treec71490983f37d74067c90a7e29055a2d0cf3d9ed
parent4bdc1b96504f5f562b129afd48ca03d79aeb1fd9
parent1ac00cc21337b0b667493d9af79d88537de90aa3
Merge branch 'merge' of git://git./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