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, 3 deletions

diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index b86712167eb8..b9101818b47b 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -68,7 +68,7 @@ static int atmtcp_send_control(struct atm_vcc *vcc,int type,
         *(struct atm_vcc **) &new_msg->vcc = vcc;
         old_test = test_bit(flag,&vcc->flags);
         out_vcc->push(out_vcc,skb);
-        add_wait_queue(sk_atm(vcc)->sk_sleep, &wait);
+        add_wait_queue(sk_sleep(sk_atm(vcc)), &wait);
         while (test_bit(flag,&vcc->flags) == old_test) {
                 mb();
                 out_vcc = PRIV(vcc->dev) ? PRIV(vcc->dev)->vcc : NULL;
@@ -80,7 +80,7 @@ static int atmtcp_send_control(struct atm_vcc *vcc,int type,
                 schedule();
         }
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(sk_atm(vcc)->sk_sleep, &wait);
+        remove_wait_queue(sk_sleep(sk_atm(vcc)), &wait);
         return error;
 }
 
@@ -105,7 +105,7 @@ static int atmtcp_recv_control(const struct atmtcp_control *msg)
                     msg->type);
                 return -EINVAL;
         }
-        wake_up(sk_atm(vcc)->sk_sleep);
+        wake_up(sk_sleep(sk_atm(vcc)));
         return 0;
 }