| commit | dc512814b5f8b7b80c74d6170b93a606ae4f36c5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jan 01 21:30:42 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jan 01 21:30:42 2008 -0800 |
| tree | 9c2af6d5f2a5cb628f80a037061d5a73d15e98ec | |
| parent | ef5fa1b191fc4cda7233491626585d1397535e26 [diff] | |
| parent | a5a971129cc6155e26315fd28a450505ccc35fd8 [diff] |
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