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

Simple merge