tree 9c2af6d5f2a5cb628f80a037061d5a73d15e98ec
parent ef5fa1b191fc4cda7233491626585d1397535e26
parent a5a971129cc6155e26315fd28a450505ccc35fd8
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1199251842 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1199251842 -0800

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix build failure on Cell when CONFIG_SPU_FS=y