original_kernel/arch/arm/mach-sa1100
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
..
Kconfig
Makefile
Makefile.boot
assabet.c
badge4.c
cerf.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00
clock.c
collie.c
collie_pm.c
cpu-sa1100.c
cpu-sa1110.c
dma.c
generic.c
generic.h
h3600.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00
hackkit.c
irq.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00
jornada720.c
lart.c
leds-assabet.c
leds-badge4.c
leds-cerf.c
leds-hackkit.c
leds-lart.c
leds-simpad.c
leds.c
leds.h
neponset.c
pleb.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00
pm.c
shannon.c
simpad.c
sleep.S
ssp.c
time.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00