From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 28 Jun 2007 18:45:12 +0000 (-0700)
Subject: Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
X-Git-Tag: v2.6.22-rc7~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0471448f4d017470995d8a2272dc8c06dbed3b77;p=linux-2.6

Merge branch 'for_linus' of master.kernel.org:/pub/scm/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
---

0471448f4d017470995d8a2272dc8c06dbed3b77