From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 20 Sep 2007 19:42:23 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=460edb3cd06865ffb231eb694b567daec3113210;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  sky2: version 1.18
  sky2: receive FIFO checking
  sky2: fe+ chip support
  sky2: reorganize chip revision features
  sky2: ethtool speed report bug
  sky2: fix VLAN receive processing (resend)
  phy: export phy_mii_ioctl
  myri10ge: Add support for PCI device id 9
---

460edb3cd06865ffb231eb694b567daec3113210