Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2011 00:46:06 +0000 (16:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2011 00:46:06 +0000 (16:46 -0800)
commit35d34df711e8b44846e759d8cfddb4ec6877cccb
tree6ee37bcc2594add1050a77fdb272eda4414fe6c8
parentab02a9540541dd7b2012f32f5e311c3cbd772387
parent36e8695ca5dcf48c837a6efe6f780c47ac9ec808
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/pseries: Disable VPNH feature
  powerpc/iseries: Fix early init access to lppaca