Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 20 Feb 2010 21:53:16 +0000 (13:53 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 20 Feb 2010 21:53:16 +0000 (13:53 -0800)

Trivial merge