]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: be7963b faf60e7)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 20 Sep 2007 19:42:23 +0000 (12:42 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 20 Sep 2007 19:42:23 +0000 (12:42 -0700)
commit460edb3cd06865ffb231eb694b567daec3113210
tree5822da2ced52195772c1edcda20a881855bd2398tree | snapshot
parentbe7963b7e7f08a149e247c0bf29a4abd174e0929commit | diff
parentfaf60e72d07d163a623e47269680918fccaa789acommit | diff
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/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
Linux 2.6 source tree