Skip to content
GitLab
Explore
Sign in
Register
xcap
xcap-capability-linux
Repository
xcap-capability-linux
block
blk-ioc.c
Find file
Blame
History
Permalink
Merge branch 'for-linus' into for-3.1/core
· 04bf7869
Jens Axboe
authored
Jul 01, 2011
Conflicts: block/blk-throttle.c block/cfq-iosched.c Signed-off-by:
Jens Axboe
<
jaxboe@fusionio.com
>
04bf7869