| commit | 17eed249539a7b756ca65a5cb0940abc48ef553b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Mar 28 19:48:26 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Mar 28 19:48:26 2008 -0700 |
| tree | ea8745536e7ee5aaf0d3b03e9d356979daf6bfb0 | |
| parent | 4ad96d39a2d74c1b2e400b602da2594f5098fc26 [diff] | |
| parent | 318a94d68979cbe9cc98a3050b4b7be2f08513c8 [diff] |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6