summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/traps_64.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 19:29:26 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 19:29:26 +0100
commit337e4a1ab4d736b8c39a4c3a233ac21f1a6c036f (patch)
tree20c58600b42600b8f62f3cfb63fc62b1a7fbc78c /arch/sh/kernel/traps_64.c
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy... (diff)
parentfat: make discard a mount option (diff)
downloadlinux-337e4a1ab4d736b8c39a4c3a233ac21f1a6c036f.tar.xz
linux-337e4a1ab4d736b8c39a4c3a233ac21f1a6c036f.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6: fat: make discard a mount option
Diffstat (limited to 'arch/sh/kernel/traps_64.c')
0 files changed, 0 insertions, 0 deletions