Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 28 Jun 2007 18:45:12 +0000 (11:45 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 28 Jun 2007 18:45:12 +0000 (11:45 -0700)
commit0471448f4d017470995d8a2272dc8c06dbed3b77
tree39fd1a0ad4004052b9d7de0fbf57105af0da47bb
parentedd5cd4a9424f22b0fa08bef5e299d41befd5622
parent5f708dd91d15876e26d7a57f97a255cedffca463
Merge branch 'for_linus' of /linux/kernel/git/galak/powerpc

* 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
  phy: Fix phy_id for Vitesse 824x PHY