aboutsummaryrefslogtreecommitdiff
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-11 14:06:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-11 14:06:15 -0800
commit06a57f4f20d7bf7c3796abd541a7d400483a4596 (patch)
tree86f7c7436a21e6c558b8e12948afb76872d56cf4 /block/cfq-iosched.c
parentfd48d6c888eb3eb3c7e94a8880c6121893bd17b8 (diff)
parent12b336a8b4ea8652372f88521bf55cef7f5d5283 (diff)
Merge git://git.infradead.org/users/cbou/battery-2.6.33
* git://git.infradead.org/users/cbou/battery-2.6.33: wm97xx_battery: Handle missing platform data gracefully
Diffstat (limited to 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions