summaryrefslogtreecommitdiffstats
path: root/fs/read_write.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 08:49:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 08:49:18 -0700
commitf56f44001cb5b40089deac094dbb74e5c9f64d81 (patch)
tree0fb004b475852ed87121a774de7b768bb6164156 /fs/read_write.c
parent162164f7e92da970666e7492fd58644f3c1f8574 (diff)
parent9ec2708053b647969bee862902872d44a5f9b439 (diff)
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] fix kprobes single stepping [S390] tape: fix dbf usage [S390] dasd: provide a Sense Path Group ID ioctl [S390] ftrace: select HAVE_C_RECORDMCOUNT [S390] vdso: get rid of redefinition warnings [S390] facility detection: remove unused variable [S390] hypfs: Fix error handling in hypfs_diag initialization [S390] topology: fix cpu masks for topology=off case [S390] topology: add SCHED_MC config option [S390] Kconfig: add machine type number to code generation options [S390] Add z196 machine type to setup_hwcaps
Diffstat (limited to 'fs/read_write.c')
0 files changed, 0 insertions, 0 deletions