Merge branch 'lpc32xx/drivers' into next/drivers

* lpc32xx/drivers: (566 commits)
  ARM: LPC32xx: ADC support for mach-lpc32xx

Includes an update to Linux 3.3-rc4

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 75049e765191..b026896206ca 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -710,7 +710,7 @@ static ssize_t adb_read(struct file *file, char __user *buf,
         req = NULL;
         spin_lock_irqsave(&state->lock, flags);
         add_wait_queue(&state->wait_queue, &wait);
-        current->state = TASK_INTERRUPTIBLE;
+        set_current_state(TASK_INTERRUPTIBLE);
 
         for (;;) {
                 req = state->completed;
@@ -734,7 +734,7 @@ static ssize_t adb_read(struct file *file, char __user *buf,
                 spin_lock_irqsave(&state->lock, flags);
         }
 
-        current->state = TASK_RUNNING;
+        set_current_state(TASK_RUNNING);
         remove_wait_queue(&state->wait_queue, &wait);
         spin_unlock_irqrestore(&state->lock, flags);