Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/ide/ide-io.c

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

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/cdrom/viocd.c
Simple merge

diff --cc drivers/ide/ide-io.c
index e4e3a0e3201e5516700b60184bfc7ebe03d308bd,6415a2e2ba87febae0cfa6e9b8342f2dbd190748..bba4297f2f03fcadf80f8bb3f3a05e780e6f3551
--- 1/drivers/ide/ide-io.c
--- 2/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@@ -704,9 -696,7 +704,9 @@@ void ide_timer_expiry (unsigned long da
                }
                spin_lock_irq(&hwif->lock);
                enable_irq(hwif->irq);
-               if (startstop == ide_stopped) {
+               if (startstop == ide_stopped && hwif->polling == 0) {
 +                      rq_in_flight = hwif->rq;
 +                      hwif->rq = NULL;
                        ide_unlock_port(hwif);
                        plug_device = 1;
                }
@@@ -879,10 -868,8 +879,10 @@@ irqreturn_t ide_intr (int irq, void *de
         * same irq as is currently being serviced here, and Linux
         * won't allow another of the same (on any CPU) until we return.
         */
-       if (startstop == ide_stopped) {
+       if (startstop == ide_stopped && hwif->polling == 0) {
                BUG_ON(hwif->handler);
 +              rq_in_flight = hwif->rq;
 +              hwif->rq = NULL;
                ide_unlock_port(hwif);
                plug_device = 1;
        }

diff --cc drivers/ide/ide-lib.c
Simple merge

diff --cc include/linux/ide.h
Simple merge