Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
authorPaul Mackerras <paulus@samba.org>
Fri, 31 Oct 2008 10:34:56 +0000 (21:34 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 31 Oct 2008 10:34:56 +0000 (21:34 +1100)
commitbfb99f8258b5981ef7a2ec8099db56317ea16695
tree2449e0968a1a14fe519475bfa29a5c4e3a60e23d
parentebdba9af940d63e469dc8e46b4aa1fc474e8ee2d
parent65325d5c45a4363b4ad2ce2a55793a131b667de6
Merge branch 'merge' of /linux/kernel/git/galak/powerpc into merge