Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc...
commit8694a1c6056f1f5f006a0442428f2df5171b9656
authorPaul Mackerras <paulus@samba.org>
Fri, 31 Oct 2008 05:08:14 +0000 (31 16:08 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 31 Oct 2008 05:08:14 +0000 (31 16:08 +1100)
tree56a855d616532ba23948e1257a0f8b1cf13347cc
parent43271c4128071c39ac8f7bfda4780c28b6401545
parent8531b7a805833649591fa324cadbab7d6b667f4b
Merge branch 'merge' of /linux/kernel/git/jwboyer/powerpc-4xx into merge