From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 7 Mar 2007 03:57:46 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.21-rc3~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f774456e4b9bc3d4fb3522b2482c7acfa2df197;p=linux-2.6

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.
---

2f774456e4b9bc3d4fb3522b2482c7acfa2df197