Merge branch 'elevator-switch' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 15:56:34 +0000 (08:56 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 15:56:34 +0000 (08:56 -0700)
commit5dd962494f76fb3ef1196cd420b5d6260d7a3766
treef6eda4fcea880e420420a2886b84ad35a6b00f28
parent28d721e24c88496ff8e9c4a0959bdc1415c0658e
parent772eca7825358f52cf208afd7ab8ce22722ce41a
Merge branch 'elevator-switch' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual fixup for trivial "gfp_t" changes.
drivers/block/elevator.c
drivers/block/ll_rw_blk.c
include/linux/blkdev.h