Merge branch 'for-linus' into for-2.6.33
authorJens Axboe <jens.axboe@oracle.com>
Tue, 13 Oct 2009 10:29:45 +0000 (12:29 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 13 Oct 2009 10:29:45 +0000 (12:29 +0200)
commitc30f33437c3f85ec48353a1ef811e148217a2aaf
treed5a0ca1e8d091a30fece2e9aeed285225c026049
parent132cc538cd90f60a0b5df6a512dfd4bc5fe2039a
parent2ec24ff1d1875defa742c76c9c7d74dca06b7e1f
Merge branch 'for-linus' into for-2.6.33
block/elevator.c