| commit | 35d34df711e8b44846e759d8cfddb4ec6877cccb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 09 16:46:06 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 09 16:46:06 2011 -0800 |
| tree | 6ee37bcc2594add1050a77fdb272eda4414fe6c8 | |
| parent | ab02a9540541dd7b2012f32f5e311c3cbd772387 [diff] | |
| parent | 36e8695ca5dcf48c837a6efe6f780c47ac9ec808 [diff] |
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/pseries: Disable VPNH feature powerpc/iseries: Fix early init access to lppaca