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>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/include/mach/irqs.h
index e881797,132256b..fa15b5f
--- 1/arch/arm/mach-shmobile/include/mach/irqs.h
--- 2/arch/arm/mach-shmobile/include/mach/irqs.h
+++ b/arch/arm/mach-shmobile/include/mach/irqs.h
@@@ -2,9 -2,7 +2,8 @@@
  #define __ASM_MACH_IRQS_H
  
  #define NR_IRQS         512
- #define NR_IRQS_LEGACY  8
  
 +/* INTCA */
  #define evt2irq(evt)          (((evt) >> 5) - 16)
  #define irq2evt(irq)          (((irq) + 16) << 5)