Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commite627539090d5a4efe1d55f1dfa24f8ce08a454e8
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 Jul 2011 03:21:27 +0000 (21 20:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Jul 2011 03:21:27 +0000 (21 20:21 -0700)
tree0e35e6923397d1129ea1469c9153fa1f5a26d55d
parent557e2a394de0d142ba930ff3cdb2909419414e06
parent94c5b41b327e08de0ddf563237855f55080652a1
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
drivers/net/jme.c