commit | 030352a9c7715780b2c01033ae9afe56249bb7cc | [log] [tgz] |
---|---|---|
author | David S. Miller <davem@davemloft.net> | Thu Jun 12 16:14:22 2008 -0700 |
committer | David S. Miller <davem@davemloft.net> | Thu Jun 12 16:14:22 2008 -0700 |
tree | cc23683773d0d63712f4e6ea6824383f1d696e05 | |
parent | e6e30add6bd8115af108de2a13ec82d997a55777 [diff] | |
parent | 0c1aa20fb87b796d904f4d89ad12e5a0c483127b [diff] |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6