Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...
authorPaul Mackerras <paulus@samba.org>
Fri, 9 May 2008 10:12:06 +0000 (20:12 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 9 May 2008 10:12:06 +0000 (20:12 +1000)
commit2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92
treeb2306840f227972a7c9d4a2b75e516fe81358ce8
parent02539d71fa98d5737bb668b02286c76241e4bac9
parent78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5
Merge branch 'for-2.6.26' of /linux/kernel/git/jwboyer/powerpc-4xx into merge
arch/powerpc/platforms/cell/spufs/sched.c