Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 39b760a24241..988e6f7af01a 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -600,8 +600,7 @@ static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive)
                                 "issuing a packet command\n");
                 return ide_do_reset (drive);
         }
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
         /* Set the interrupt routine */
         ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry);
         /* Send the actual packet */
@@ -691,8 +690,7 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
                 set_bit(PC_DMA_OK, &pc->flags);
 
         if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags)) {
-                if (HWGROUP(drive)->handler != NULL)
-                        BUG();
+                BUG_ON(HWGROUP(drive)->handler != NULL);
                 ide_set_handler(drive, &idescsi_transfer_pc,
                                 get_timeout(pc), idescsi_expiry);
                 /* Issue the packet command */