aboutsummaryrefslogtreecommitdiff
path: root/fs/xfs/linux-2.6
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-16 08:46:10 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-16 08:46:10 -0700
commit716f8954fb3029ca2df52a986b60af8d06f093ee (patch)
treed5f983daab287e0a46ac2a76e78a13037b7ed9b6 /fs/xfs/linux-2.6
parenta4523a8b38089478f93bc053c31f678c63f5ee1b (diff)
parentcb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 (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
Diffstat (limited to 'fs/xfs/linux-2.6')
0 files changed, 0 insertions, 0 deletions