| commit | f100353ff5bfd83be00ae55e98b4d611d2eb5681 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Fri, 28 Sep 2007 22:32:29 +0000 (28 15:32 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Fri, 28 Sep 2007 22:32:29 +0000 (28 15:32 -0700) | ||
| tree | 95c46d1793231b9046676d19cff8b03d13e01eb5 | treesnapshot (tar.gz zip) |
| parent | 46d5c95b135f73051df7bc001e2d5c8e77e54cd6 | commitdiff |
| parent | f4ec7f98714c2c0b7afa422c0cba6fb5c875c2c2 | commitdiff |
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:
e1000: Add device IDs of blade version of the 82571 quad port
sky2: fix transmit state on resume
sky2: FE+ vlan workaround
sky2: sky2 FE+ receive status workaround
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
e1000: Add device IDs of blade version of the 82571 quad port
sky2: fix transmit state on resume
sky2: FE+ vlan workaround
sky2: sky2 FE+ receive status workaround