Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2008 05:44:03 +0000 (21:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2008 05:44:03 +0000 (21:44 -0800)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
  powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs


Trivial merge