summaryrefslogtreecommitdiffstats
path: root/block/ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds2006-12-05 04:38:30 +0100
committerLinus Torvalds2006-12-05 04:38:30 +0100
commit2d941e99dfa2f58f4cf294943274a4f8e264aab7 (patch)
treeb69e97f05d2fb0fbf1068c5a22f0c8420f7a198e /block/ioctl.c
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parent[PATCH] blktrace: don't return blktrace_seq from trace_note() (diff)
downloadkernel-qcow2-linux-2d941e99dfa2f58f4cf294943274a4f8e264aab7.tar.gz
kernel-qcow2-linux-2d941e99dfa2f58f4cf294943274a4f8e264aab7.tar.xz
kernel-qcow2-linux-2d941e99dfa2f58f4cf294943274a4f8e264aab7.zip
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] blktrace: don't return blktrace_seq from trace_note() [PATCH] blktrace: uninline trace_note()
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions