Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <[email protected]>
Wed, 18 Jan 2006 01:19:53 +0000 (17:19 -0800)
committerLinus Torvalds <[email protected]>
Wed, 18 Jan 2006 01:19:53 +0000 (17:19 -0800)

Trivial merge