Merge commit 'v2.6.38-rc4' into imx-for-2.6.39

Conflicts:
	arch/arm/mach-mxs/clock-mx28.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c
index ebae344ce910..c956ed6c83a3 100644
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@ -316,9 +316,9 @@ int paste_selection(struct tty_struct *tty)
         /* always called with BTM from vt_ioctl */
         WARN_ON(!tty_locked());
 
-        acquire_console_sem();
+        console_lock();
         poke_blanked_console();
-        release_console_sem();
+        console_unlock();
 
         ld = tty_ldisc_ref(tty);
         if (!ld) {