diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 05:02:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 05:02:02 +0300 |
| commit | 1fa185ebcbcefdc5229c783450c9f0439a69f0c1 (patch) | |
| tree | 78df9ad77a7ff85a8bbe5202b3d8b47f2764f783 /arch/sparc/include/asm/floppy.h | |
| parent | a9724125ad014decf008d782e60447c811391326 (diff) | |
| parent | 9987c19ed9a71693bf3efce2957666b2513a5252 (diff) | |
| download | linux-1fa185ebcbcefdc5229c783450c9f0439a69f0c1.tar.xz | |
Merge tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris
Pull CRIS changes from Jesper Nilsson.
* tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
CRIS: Whitespace cleanup
CRIS: macro whitespace fixes in uaccess.h
CRIS: uaccess: fix sparse errors
CRISv32: Remove unnecessary KERN_INFO from sync_serial
CRIS: Fix missing NR_CPUS in menuconfig
CRISv32: Avoid warning of unused variable
CRIS: Avoid warning in cris mm/fault.c
CRIS: Export csum_partial_copy_nocheck
Diffstat (limited to 'arch/sparc/include/asm/floppy.h')
0 files changed, 0 insertions, 0 deletions