Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block

[linux-2.6.git] / block / as-iosched.c

diff --git a/drivers/block/as-iosched.c b/block/as-iosched.c
similarity index 100%
rename from drivers/block/as-iosched.c
rename to block/as-iosched.c