| commit | 76fef2b6bffa13ad7ccd54c0493b053295721b9a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Mar 22 18:22:42 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sat Mar 22 18:22:42 2008 -0700 |
| tree | f4509477d413398b7155fb3c35453ab26bd81bce | |
| parent | 817bc4db7794d6dc6594265ddea88d2b839cf2f8 [diff] | |
| parent | ef8500457b29eed13d03ff19af36d810308e57b7 [diff] |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 Conflicts: drivers/s390/net/qeth_main.c