Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge

This commit is contained in:
Paul Mackerras 2008-11-24 11:54:08 +11:00
commit 3f9b5d4dda