git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[safe/jmp/linux-2.6]
/
include
/
linux
/
iocontext.h
diff --git
a/include/linux/iocontext.h
b/include/linux/iocontext.h
index
a0bb301
..
64d5291
100644
(file)
--- a/
include/linux/iocontext.h
+++ b/
include/linux/iocontext.h
@@
-7,7
+7,6
@@
struct cfq_queue;
struct cfq_io_context {
void *key;
- unsigned long dead_key;
struct cfq_queue *cfqq[2];