Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into...
authorPaul Mackerras <paulus@samba.org>
Mon, 24 Nov 2008 00:54:08 +0000 (11:54 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 24 Nov 2008 00:54:08 +0000 (11:54 +1100)

Trivial merge