Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 03:27:51 +0000 (20:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 03:27:51 +0000 (20:27 -0700)
commit7afb380db43ed137b7f67e0e3c3e5afd1ecde730
treeb0b27baa2b798525e6c40c49ac908f7edc1d3833
parenta4056573873dc9fc506ce9293c4d01670101a637
parent208aefa2451cc1f4d87622cb9b2ca4333afa8337
Merge branch 'davem-fixes' of /linux/kernel/git/jgarzik/netdev-2.6