Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 11 Dec 2010 00:34:10 +0000 (16:34 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Dec 2010 00:34:10 +0000 (16:34 -0800)

Trivial merge