Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

author Paul Mackerras <paulus@samba.org>

Fri, 9 May 2008 10:12:06 +0000 (20:12 +1000)

committer Paul Mackerras <paulus@samba.org>

Fri, 9 May 2008 10:12:06 +0000 (20:12 +1000)
author Paul Mackerras <paulus@samba.org>
Fri, 9 May 2008 10:12:06 +0000 (20:12 +1000)
committer Paul Mackerras <paulus@samba.org>
Fri, 9 May 2008 10:12:06 +0000 (20:12 +1000)
diff --cc arch/powerpc/platforms/cell/spufs/sched.c
Simple merge
author	Paul Mackerras <paulus@samba.org>
	Fri, 9 May 2008 10:12:06 +0000 (20:12 +1000)
committer	Paul Mackerras <paulus@samba.org>
	Fri, 9 May 2008 10:12:06 +0000 (20:12 +1000)