From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=2f774456e4b9bc3d4fb3522b2482c7acfa2df197;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge /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