s Torvalds <torvalds@g5.osdl.org> 1131474180 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1131474180 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
b�i