Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jul 2008 00:34:00 +0000 (17:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jul 2008 00:34:00 +0000 (17:34 -0700)
commite89f38218ff6de09983bd8769ec0cdf6e70d9e8e
tree92bcfb6f347be2132ae446ae3403eed62278b053
parent7b35fa86e47f83db27056b202463d926ff0a2c8f
parentfc532f810832beb3306b42526a78f411972281c7
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: Fix boot problem due to AT_BASE_PLATFORM change