Merge branch 'master' into for-2.6.31
authorJens Axboe <jens.axboe@oracle.com>
Fri, 22 May 2009 18:28:35 +0000 (20:28 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 22 May 2009 18:28:35 +0000 (20:28 +0200)
commit9bd7de51ee8537094656149eaf45338cadb7d7d4
treea691987319dfcdb07de2bce619746f88d26882c4
parente4b636366c00738b9609cda307014d71b1225b7f
parent6a44587ee716ac911082cbdec766e5b3f051c071
Merge branch 'master' into for-2.6.31

Conflicts:
drivers/ide/ide-io.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
drivers/block/xen-blkfront.c
drivers/cdrom/viocd.c
drivers/ide/ide-io.c
drivers/ide/ide-lib.c
include/linux/ide.h