tree 38869c0d82a1d47cc3c9cf5c148be2e996d605ea
parent 5b3c1184e78dd7d74eced83b25af88cf1d13e686
parent 78ad0b840848bebe266bcc8f1f9be429d2105264
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1173239866 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1173239866 -0800

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix floppy build failure.