aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/input.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-18 16:21:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-18 16:21:18 -0400
commit8a83f33100c691f5a576dba259cc05502dc358f0 (patch)
treec10c74bd28026cefdb8caa1362a0ccc30ea695a5 /include/linux/input.h
parent5d5b1b9f79ebad81215d11e208e9bfa9679a4ddd (diff)
parent24ecfbe27f65563909b14492afda2f1c21f7c044 (diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: add blk_run_queue_async block: blk_delay_queue() should use kblockd workqueue md: fix up raid1/raid10 unplugging. md: incorporate new plugging into raid5. md: provide generic support for handling unplug callbacks. md - remove old plugging code. md/dm - remove remains of plug_fn callback. md: use new plugging interface for RAID IO. block: drop queue lock before calling __blk_run_queue() for kblockd punt Revert "block: add callback function for unplug notification" block: Enhance new plugging support to support general callbacks
Diffstat (limited to 'include/linux/input.h')
0 files changed, 0 insertions, 0 deletions