tree 760b67b3624eda62e943e48ce93635c30a5b47bf
parent b9ed7252d219c1c663944bf03846eabb515dbe75
parent 279e677faa775ad16e75c32e1bf4a37f8158bc61
author Jens Axboe <jens.axboe@oracle.com> 1243016734 +0200
committer Jens Axboe <jens.axboe@oracle.com> 1243016734 +0200

Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>