Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/arm/configs/ap4evb_defconfig
	arch/arm/configs/g3evm_defconfig
	arch/arm/configs/g4evm_defconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 188bc8496a26..d02be78a4138 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -176,16 +176,18 @@ static ssize_t led_proc_write(struct file *file, const char *buf,
         size_t count, loff_t *pos)
 {
         void *data = PDE(file->f_path.dentry->d_inode)->data;
-        char *cur, lbuf[count + 1];
+        char *cur, lbuf[32];
         int d;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
-        memset(lbuf, 0, count + 1);
+        if (count >= sizeof(lbuf))
+                count = sizeof(lbuf)-1;
 
         if (copy_from_user(lbuf, buf, count))
                 return -EFAULT;
+        lbuf[count] = 0;
 
         cur = lbuf;