Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 13 Jan 2008 18:01:45 +0000 (10:01 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 13 Jan 2008 18:01:45 +0000 (10:01 -0800)
commitfd4be699b5b6b1744c9b0736d991ccfb35eea575
treebdccb54bef111c341c5cfcf02e1c1c722b24666d
parent417009f64f17d76322d148a2cda40dfec37bcf0b
parent473980a99316c0e788bca50996375a2815124ce1
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 CPU hotplug when using the SLB shadow buffer
  [POWERPC] efika: add phy-handle property for fec_mpc52xx