From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 6 Aug 2010 17:13:19 +0000 (+0100)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
X-Git-Tag: v2.6.36-rc1~102^2^2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=500b9fc922cbec572f4fd1436533bfaed5011262;p=platform%2Fkernel%2Flinux-3.10.git

Merge /linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
	drivers/net/irda/sh_irda.c
---

500b9fc922cbec572f4fd1436533bfaed5011262
diff --cc drivers/net/irda/sh_irda.c
index edd5666,9db7084..9e3f4f5
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@@ -748,8 -748,7 +748,7 @@@ static int __devinit sh_irda_probe(stru
  	struct net_device *ndev;
  	struct sh_irda_self *self;
  	struct resource *res;
- 	char clk_name[8];
 -	unsigned int irq;
 +	int irq;
  	int err = -ENOMEM;
  
  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);