From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 4 Aug 2010 02:56:17 +0000 (+0900)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: upstream/snapshot3+hdmi~13318^2^2^2~1^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of git://git./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>
---

701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb
diff --cc arch/arm/mach-shmobile/include/mach/irqs.h
index e881797,132256b..fa15b5f
--- a/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)