Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 27 Aug 2008 10:54:45 +0000 (03:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Aug 2008 10:54:45 +0000 (03:54 -0700)
commitdf69471290cbec7714f6d1fabd14f4e41219cee1
tree1a8d9d3fce98db7b4382c24994feba6fa771805f
parentd994af0d50efc96b2077978fe9f066992639d525
parent17393dd67c06c3912ff47b31268b648929715336
Merge branch 'davem-fixes' of /linux/kernel/git/jgarzik/netdev-2.6