Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
	drivers/net/irda/sh_irda.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/sh/boards/mach-ap325rxa/setup.c
Simple merge

diff --cc drivers/net/irda/sh_irda.c
index edd5666f0ffbde3e7bdce003278e93b44227ad05,9db7084bc001675df959c60099f117688f56dcdb..9e3f4f54281d984053155cb9a4854f876120b251
--- 1/drivers/net/irda/sh_irda.c
--- 2/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);

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/Makefile
Simple merge