Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorDavid S. Miller <davem@davemloft.net>
Fri, 13 Apr 2012 20:32:07 +0000 (13:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Apr 2012 20:32:07 +0000 (13:32 -0700)

Trivial merge