]> git.baikalelectronics.ru Git - kernel.git/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)
commit9a6057aa82fedf702c7d67c355047e2df2a4a54a
tree38869c0d82a1d47cc3c9cf5c148be2e996d605ea
parentd2d90fd7798bb0dca8e3d3293f9fb1dde5cf99f7
parentec0c541073f0c8dc1203b5d82f588301fc81de0a
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.