Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Jun 2008 04:32:08 +0000 (21:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jun 2008 04:32:08 +0000 (21:32 -0700)
commit4552e1198a08198ce0b42e856845b5394c82c59c
tree1e89b580a7a7f06d3765e50ef4ba642e37b06b4f
parentf09f7ee20c867818bacf79426cf491b2749e7eff
parent58c7821c4264a7ddd6f0c31c5caaf393b3897f10
Merge branch 'davem-fixes' of /linux/kernel/git/jgarzik/netdev-2.6