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)
commit341e55805d671948c2a93d3d6c7e9babb47de5d8
tree62ad370e5735147194d8f3e3ace8a3ff0d64e61b
parentaaad077638be1a25871bcae5e43952d6b63abfca
parentb2c2717bae3ad62f18a51ea10188176134bac79c
Merge branch 'merge' of git://git./linux/kernel/git/galak/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
  powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs