11 files changed, 33 insertions, 29 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3a75a0b2bebb..a04f507e7f2c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1072,6 +1072,8 @@ source "drivers/rtc/Kconfig"
 
 source "drivers/dma/Kconfig"
 
+source "drivers/dca/Kconfig"
+
 endmenu
 
 source "fs/Kconfig"
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index f65baa95986e..d5f6ea14fc7b 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -40,31 +40,29 @@ static int fsample_keymap[] = {
         KEY(0,1,KEY_RIGHT),
         KEY(0,2,KEY_LEFT),
         KEY(0,3,KEY_DOWN),
-        KEY(0,4,KEY_CENTER),
-        KEY(0,5,KEY_0_5),
-        KEY(1,0,KEY_SOFT2),
+        KEY(0,4,KEY_ENTER),
+        KEY(1,0,KEY_F10),
         KEY(1,1,KEY_SEND),
         KEY(1,2,KEY_END),
         KEY(1,3,KEY_VOLUMEDOWN),
         KEY(1,4,KEY_VOLUMEUP),
         KEY(1,5,KEY_RECORD),
-        KEY(2,0,KEY_SOFT1),
+        KEY(2,0,KEY_F9),
         KEY(2,1,KEY_3),
         KEY(2,2,KEY_6),
         KEY(2,3,KEY_9),
-        KEY(2,4,KEY_SHARP),
-        KEY(2,5,KEY_2_5),
+        KEY(2,4,KEY_KPDOT),
         KEY(3,0,KEY_BACK),
         KEY(3,1,KEY_2),
         KEY(3,2,KEY_5),
         KEY(3,3,KEY_8),
         KEY(3,4,KEY_0),
-        KEY(3,5,KEY_HEADSETHOOK),
+        KEY(3,5,KEY_KPSLASH),
         KEY(4,0,KEY_HOME),
         KEY(4,1,KEY_1),
         KEY(4,2,KEY_4),
         KEY(4,3,KEY_7),
-        KEY(4,4,KEY_STAR),
+        KEY(4,4,KEY_KPASTERISK),
         KEY(4,5,KEY_POWER),
         0
 };
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 22db19a53647..182a98a9df4c 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -36,8 +36,6 @@
 #include <asm/arch/omapfb.h>
 #include <asm/arch/lcd_mipid.h>
 
-#include "../plat-omap/dsp/dsp_common.h"
-
 #define ADS7846_PENDOWN_GPIO    15
 
 static void __init omap_nokia770_init_irq(void)
@@ -318,6 +316,8 @@ static __init int omap_dsp_init(void)
  out:
         return ret;
 }
+#else
+#define omap_dsp_init()         do {} while (0)
 #endif  /* CONFIG_OMAP_DSP */
 
 static void __init omap_nokia770_init(void)
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 1d5c8d509722..e44437e10eef 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -39,31 +39,29 @@ static int p2_keymap[] = {
         KEY(0,1,KEY_RIGHT),
         KEY(0,2,KEY_LEFT),
         KEY(0,3,KEY_DOWN),
-        KEY(0,4,KEY_CENTER),
-        KEY(0,5,KEY_0_5),
-        KEY(1,0,KEY_SOFT2),
+        KEY(0,4,KEY_ENTER),
+        KEY(1,0,KEY_F10),
         KEY(1,1,KEY_SEND),
         KEY(1,2,KEY_END),
         KEY(1,3,KEY_VOLUMEDOWN),
         KEY(1,4,KEY_VOLUMEUP),
         KEY(1,5,KEY_RECORD),
-        KEY(2,0,KEY_SOFT1),
+        KEY(2,0,KEY_F9),
         KEY(2,1,KEY_3),
         KEY(2,2,KEY_6),
         KEY(2,3,KEY_9),
-        KEY(2,4,KEY_SHARP),
-        KEY(2,5,KEY_2_5),
+        KEY(2,4,KEY_KPDOT),
         KEY(3,0,KEY_BACK),
         KEY(3,1,KEY_2),
         KEY(3,2,KEY_5),
         KEY(3,3,KEY_8),
         KEY(3,4,KEY_0),
-        KEY(3,5,KEY_HEADSETHOOK),
+        KEY(3,5,KEY_KPSLASH),
         KEY(4,0,KEY_HOME),
         KEY(4,1,KEY_1),
         KEY(4,2,KEY_4),
         KEY(4,3,KEY_7),
-        KEY(4,4,KEY_STAR),
+        KEY(4,4,KEY_KPASTERISK),
         KEY(4,5,KEY_POWER),
         0
 };
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index aff71fec618a..d0447723b73a 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -43,11 +43,11 @@ pxa_cpu_save_cp:
 pxa_cpu_save_sp:
         @ preserve phys address of stack
         mov     r0, sp
-        mov     r2, lr
+        str     lr, [sp, #-4]!
         bl      sleep_phys_sp
         ldr     r1, =sleep_save_sp
         str     r0, [r1]
-        mov     pc, r2
+        ldr     pc, [sp], #4
 
 /*
  * pxa27x_cpu_suspend()
@@ -270,5 +270,3 @@ resume_after_mmu:
         mar     acc0, r2, r3
 #endif
         ldmfd   sp!, {r4 - r12, pc}             @ return to caller
-
-
diff --git a/arch/cris/arch-v10/kernel/io_interface_mux.c b/arch/cris/arch-v10/kernel/io_interface_mux.c
index 3a9114e89edf..f3b327d4ed9c 100644
--- a/arch/cris/arch-v10/kernel/io_interface_mux.c
+++ b/arch/cris/arch-v10/kernel/io_interface_mux.c
@@ -392,6 +392,7 @@ int cris_request_io_interface(enum cris_io_interface ioif, const char *device_id
         if (((interfaces[ioif].gpio_g_in & gpio_in_pins) != interfaces[ioif].gpio_g_in) ||
             ((interfaces[ioif].gpio_g_out & gpio_out_pins) != interfaces[ioif].gpio_g_out) ||
             ((interfaces[ioif].gpio_b & gpio_pb_pins) != interfaces[ioif].gpio_b)) {
+                local_irq_restore(flags);
                 printk(KERN_CRIT "cris_request_io_interface: Could not get required pins for interface %u\n",
                        ioif);
                 return -EBUSY;
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index feba9679ace8..7c069a02c1dd 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -447,7 +447,7 @@ static void	usa26_indat_callback(struct urb *urb)
 
         port = (struct usb_serial_port *) urb->context;
         tty = port->tty;
-        if (urb->actual_length) {
+        if (tty && urb->actual_length) {
                 /* 0x80 bit is error flag */
                 if ((data[0] & 0x80) == 0) {
                         /* no errors on individual bytes, only possible overrun err*/
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index ad35033f1a48..b3c31d9dc591 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -488,7 +488,7 @@ static int s3c2410fb_set_par(struct fb_info *info)
                 break;
         }
 
-        info->fix.line_length = (var->width * var->bits_per_pixel) / 8;
+        info->fix.line_length = (var->xres_virtual * var->bits_per_pixel) / 8;
 
         /* activate this new configuration */
 
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index e65dd0b47cdc..f994bb8065e6 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1378,7 +1378,7 @@ sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp)
 /*
  * Functions related to boot-time initialization:
  */
-static void __devinit init_hrtimers_cpu(int cpu)
+static void __cpuinit init_hrtimers_cpu(int cpu)
 {
         struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
         int i;
diff --git a/kernel/timer.c b/kernel/timer.c
index 26671f4db07f..2a00c22203f3 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1289,7 +1289,7 @@ static void migrate_timer_list(tvec_base_t *new_base, struct list_head *head)
         }
 }
 
-static void __devinit migrate_timers(int cpu)
+static void __cpuinit migrate_timers(int cpu)
 {
         tvec_base_t *old_base;
         tvec_base_t *new_base;
diff --git a/security/commoncap.c b/security/commoncap.c
index 5bc1895f3f9c..ea61bc73f6d3 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -59,6 +59,12 @@ int cap_netlink_recv(struct sk_buff *skb, int cap)
 
 EXPORT_SYMBOL(cap_netlink_recv);
 
+/*
+ * NOTE WELL: cap_capable() cannot be used like the kernel's capable()
+ * function.  That is, it has the reverse semantics: cap_capable()
+ * returns 0 when a task has a capability, but the kernel's capable()
+ * returns 1 for this case.
+ */
 int cap_capable (struct task_struct *tsk, int cap)
 {
         /* Derived from include/linux/sched.h:capable. */
@@ -107,10 +113,11 @@ static inline int cap_block_setpcap(struct task_struct *target)
 static inline int cap_inh_is_capped(void)
 {
         /*
-         * return 1 if changes to the inheritable set are limited
-         * to the old permitted set.
+         * Return 1 if changes to the inheritable set are limited
+         * to the old permitted set. That is, if the current task
+         * does *not* possess the CAP_SETPCAP capability.
          */
-        return !cap_capable(current, CAP_SETPCAP);
+        return (cap_capable(current, CAP_SETPCAP) != 0);
 }
 
 #else /* ie., ndef CONFIG_SECURITY_FILE_CAPABILITIES */