summaryrefslogtreecommitdiff
path: root/fs/cifs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 18:50:27 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 18:50:27 (GMT)
commit9f22aae04631ec90eeab804b024de3c658dae406 (patch)
treea96393e19eff70ef7d5c50496abfea335301a44c /fs/cifs
parent988c7f2d6d5622c2407bcad49c0349fbad6489a7 (diff)
parent531d2895917566ab0d82faa0696d0576569f1053 (diff)
downloadlinux-fsl-qoriq-9f22aae04631ec90eeab804b024de3c658dae406.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (22 commits) m68knommu: Use generic show_interrupts() coldfire_qspi compile fix m68k: merge the mmu and non-mmu versions of sys_m68k.c m68knommu: use asm-generic/bitops/ext2-atomic.h m68knommu: Remove obsolete #include <linux/sys.h> m68k: merge mmu and non-mmu versions of asm-offsets.c m68k: merge non-mmu and mmu versions of m68k_ksyms.c m68knommu: remove un-needed exporting of COLDFIRE symbols m68knommu: move EXPORT of kernel_thread to function definition m68knommu: move EXPORT of local checksumming functions to definitions m68knommu: move EXPORT of dump_fpu to function definition m68knommu: clean up mm/init_no.c m68k: merge the mmu and non-mmu mm/Makefile m68k: mv kmap_mm.c to kmap.c m68knommu: remove stubs for __ioremap() and iounmap() m68knommu: remove unused kernel_set_cachemode() m68k: let Makefile sort out compiling mmu and non-mmu lib/checksum.c m68k: remove duplicate memcpy() implementation m68k: remove duplicate memset() implementation m68k: remove duplicate memmove() implementation ...
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions