Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index ef1f3330a10e..2506c957712e 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -1186,8 +1186,10 @@ static ssize_t smu_read_command(struct file *file, struct smu_private *pp,
                 return -EOVERFLOW;
         spin_lock_irqsave(&pp->lock, flags);
         if (pp->cmd.status == 1) {
-                if (file->f_flags & O_NONBLOCK)
+                if (file->f_flags & O_NONBLOCK) {
+                        spin_unlock_irqrestore(&pp->lock, flags);
                         return -EAGAIN;
+                }
                 add_wait_queue(&pp->wait, &wait);
                 for (;;) {
                         set_current_state(TASK_INTERRUPTIBLE);