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

diff --cc Makefile
Simple merge

diff --cc block/as-iosched.c
Simple merge

diff --cc block/ll_rw_blk.c
Simple merge