Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block
[linux-3.10.git] / block / as-iosched.c