Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Mon, 14 Apr 2008 11:11:02 +0000 (21:11 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 14 Apr 2008 11:11:02 +0000 (21:11 +1000)
commitac7c5353b189e10cf5dd27399f64f7b013abffc6
tree8222d92b774c256d6ec4399c716d76b3f05ddc4b
parenta8f75ea70c58546205fb7673be41455b9da5d9a7
parent120dd64cacd4fb796bca0acba3665553f1d9ecaa
Merge branch 'linux-2.6'
Documentation/kernel-parameters.txt
arch/powerpc/kernel/process.c
arch/powerpc/kernel/rtas_flash.c
arch/powerpc/oprofile/cell/vma_map.c
arch/powerpc/sysdev/cpm2.c