]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 May 2006 15:46:10 +0000 (08:46 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 May 2006 15:46:10 +0000 (08:46 -0700)
commit4be8f9ac5e345c95b84dc10c0cd80fb517073271
treed5f983daab287e0a46ac2a76e78a13037b7ed9b6
parent9e192422276f1f71b104620832b751b29f6258f6
parentcb8faaa9957184b52c3d1e66f95cbc578e1a9e73
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