]> err.no Git - linux-2.6/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Mar 2007 03:57:46 +0000 (19:57 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Mar 2007 03:57:46 +0000 (19:57 -0800)
commit2f774456e4b9bc3d4fb3522b2482c7acfa2df197
tree38869c0d82a1d47cc3c9cf5c148be2e996d605ea
parent5b3c1184e78dd7d74eced83b25af88cf1d13e686
parent78ad0b840848bebe266bcc8f1f9be429d2105264
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.