commit | fd4be699b5b6b1744c9b0736d991ccfb35eea575 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Jan 13 10:01:45 2008 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Jan 13 10:01:45 2008 -0800 |
tree | bdccb54bef111c341c5cfcf02e1c1c722b24666d | |
parent | 417009f64f17d76322d148a2cda40dfec37bcf0b [diff] | |
parent | 473980a99316c0e788bca50996375a2815124ce1 [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 CPU hotplug when using the SLB shadow buffer [POWERPC] efika: add phy-handle property for fec_mpc52xx