Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
commitdc512814b5f8b7b80c74d6170b93a606ae4f36c5
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 2 Jan 2008 05:30:42 +0000 (1 21:30 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 2 Jan 2008 05:30:42 +0000 (1 21:30 -0800)
tree9c2af6d5f2a5cb628f80a037061d5a73d15e98ec
parentef5fa1b191fc4cda7233491626585d1397535e26
parenta5a971129cc6155e26315fd28a450505ccc35fd8
Merge branch 'merge' of git://git./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