diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:55:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:55:45 -0400 |
| commit | bcd618e4eac6fbf82de05d23c15ecb694c62b8af (patch) | |
| tree | e1a85b6a5f10c7ac20ef3b3357e15c5802dca019 /scripts | |
| parent | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream (diff) | |
| parent | Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream-fixes (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/net/e1000/e1000_ethtool.c
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions