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)
Manual fixup for trivial "gfp_t" changes.


Trivial merge