Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 23:14:22 +0000 (16:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 23:14:22 +0000 (16:14 -0700)
commit030352a9c7715780b2c01033ae9afe56249bb7cc
treecc23683773d0d63712f4e6ea6824383f1d696e05
parente6e30add6bd8115af108de2a13ec82d997a55777
parent0c1aa20fb87b796d904f4d89ad12e5a0c483127b
Merge branch 'davem-next' of /linux/kernel/git/jgarzik/netdev-2.6