| commit | 38407aad0d1860515223075f33843a386277a30a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 06 15:46:28 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 06 15:46:28 2008 -0800 |
| tree | 05659e9527ff0c76c18dd47948bae3bfb6fc3ea9 | |
| parent | 39d4e58d36321b3c3b4025d9bf28bf026c2a5bb1 [diff] | |
| parent | 454666eb78d890f5740ea1901f8b01a43c77c67c [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 "unused variable" warning in pci_dlpar.c powerpc/cell: Fix compile error in ras.c powerpc/ps3: Fix compile error in ps3-lpm.c