aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-06 19:57:46 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-06 19:57:46 -0800
commit2f774456e4b9bc3d4fb3522b2482c7acfa2df197 (patch)
tree38869c0d82a1d47cc3c9cf5c148be2e996d605ea /Makefile
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[SPARC64]: Fix floppy build failure. (diff)
downloadlinux-dev-2f774456e4b9bc3d4fb3522b2482c7acfa2df197.tar.xz
linux-dev-2f774456e4b9bc3d4fb3522b2482c7acfa2df197.zip
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.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions