| commit | 716f8954fb3029ca2df52a986b60af8d06f093ee | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue May 16 08:46:10 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue May 16 08:46:10 2006 -0700 |
| tree | d5f983daab287e0a46ac2a76e78a13037b7ed9b6 | |
| parent | a4523a8b38089478f93bc053c31f678c63f5ee1b [diff] | |
| parent | cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 [diff] |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] Fix pSeries identification in prom_init.c [PATCH] powerpc: fix kernel version display on pseries boxes