]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5715dc53eb6426386c6ea9baaa1fd2ef37b65752
treea691987319dfcdb07de2bce619746f88d26882c4
parent531ca7ee105e15e8b6e8ac21666c87ea9743200c
parent5283284e2365ef2b182b0a52497c80d2714fe379
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