diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 17:41:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 17:41:48 -0400 |
| commit | 7b12887244293eb54acd07c6296b830b3af0f6da (patch) | |
| tree | 7af1b624b3248d5a9e38c787f998dc63738b85ab /drivers/net/ixgbe/ixgbe_ethtool.c | |
| parent | 6631424fd2efd75e7394b318ad2a8597327857a9 (diff) | |
| parent | bc8a67386fd462914269fa93446e1891955a8bb3 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_via: fix VT6410/6415/6330 detection issue
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_ethtool.c')
0 files changed, 0 insertions, 0 deletions