diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 19:57:46 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 19:57:46 -0800 |
commit | 2f774456e4b9bc3d4fb3522b2482c7acfa2df197 (patch) | |
tree | 38869c0d82a1d47cc3c9cf5c148be2e996d605ea /include/asm-xtensa/device.h | |
parent | 5b3c1184e78dd7d74eced83b25af88cf1d13e686 (diff) | |
parent | 78ad0b840848bebe266bcc8f1f9be429d2105264 (diff) |
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 'include/asm-xtensa/device.h')
0 files changed, 0 insertions, 0 deletions