leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b4b9034132
linux/arch
History
Linus Torvalds b4b9034132 Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
  [ARM] 3683/2:  ARM: Convert at91rm9200 to generic irq handling
  [ARM] 3682/2:  ARM: Convert ixp4xx to generic irq handling
  [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling
  [ARM] 3701/1: ARM: Convert plat-omap to generic irq handling
  [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling
  [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling
  [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling
  [ARM] 3697/1: ARM: Convert shark to generic irq handling
  [ARM] 3696/1: ARM: Convert clps711x to generic irq handling
  [ARM] 3694/1: ARM: Convert ecard driver to generic irq handling
  [ARM] 3693/1: ARM: Convert omap1 to generic irq handling
  [ARM] 3691/1: ARM: Convert imx to generic irq handling
  [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling
  [ARM] 3687/1: ARM: Convert integrator to generic irq handling
  [ARM] 3685/1: ARM: Convert pxa to generic irq handling
  [ARM] 3684/1: ARM: Convert l7200 to generic irq handling
  [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling
  [ARM] 3680/1: ARM: Convert footbridge to generic irq handling
  [ARM] 3695/1: ARM drivers/pcmcia: Fixup includes
  [ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes
  ...

Manual conflict resolved in kernel/irq/handle.c (butt-ugly ARM tickless
code).
2006-07-02 15:07:45 -07:00
..
alpha [PATCH] irq-flags: ALPHA: Use the new IRQF_ constants 2006-07-02 13:58:46 -07:00
arm Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
arm26 [PATCH] irq-flags: ARM26: Use the new IRQF_ constants 2006-07-02 13:58:46 -07:00
cris [PATCH] irq-flags: CRIS: Use the new IRQF_ constants 2006-07-02 13:58:46 -07:00
frv [PATCH] irq-flags: FRV: Use the new IRQF_ constants 2006-07-02 13:58:46 -07:00
h8300 [PATCH] irq-flags: H8300: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
i386 [PATCH] irq-flags: i386: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
ia64 [PATCH] irq-flags: IA64: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
m32r [PATCH] irq-flags: M32R: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
m68k [PATCH] irq-flags: M68K: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
m68knommu [PATCH] irq-flags: M68KNOMMU: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
mips [PATCH] irq-flags: MIPS: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
parisc [PATCH] irq-flags: PARISC: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
powerpc [PATCH] irq-flags: POWERPC: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
ppc [PATCH] irq-flags: PPC: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
s390 [PATCH] s390: put sys_call_table into .rodata section and write protect it 2006-07-01 09:56:04 -07:00
sh [PATCH] irq-flags: SH: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
sh64 [PATCH] irq-flags: SH64: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
sparc [PATCH] irq-flags: SPARC: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
sparc64 [PATCH] irq-flags: SPARC64: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
um [PATCH] irq-flags: UM: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
v850 [PATCH] irq-flags: V850: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
x86_64 [PATCH] irq-flags: x86_64: Use the new IRQF_ constants 2006-07-02 13:58:49 -07:00
xtensa [PATCH] irq-flags: XTENSA: Use the new IRQF_ constants 2006-07-02 13:58:49 -07:00