]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 417009f 473980a)
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)
* '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


Trivial merge
Linux 2.6 source tree