Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 00:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
b4b9034132
linux/arch/arm/mach-sa1100
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
..
assabet.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
badge4.c [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
cerf.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00
clock.c [ARM] Convert SA1111 to use clock architecture 2006-03-21 22:05:53 +00:00
collie_pm.c [ARM] 3385/1: Battery support for sharp zaurus sl-5500 (collie) 2006-03-25 21:57:57 +00:00
collie.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpu-sa1100.c [ARM] 3416/1: Update LART site URL 2006-03-27 15:32:30 +01:00
cpu-sa1110.c [ARM] Fix sa11x0 SDRAM selection 2006-06-29 20:58:25 +01:00
dma.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
generic.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
generic.h [ARM] Fix warning in arch/arm/mach-sa1100/generic.c 2005-09-18 22:16:41 +01:00
h3600.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00
hackkit.c [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
irq.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00
jornada720.c [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
Kconfig [ARM] 3416/1: Update LART site URL 2006-03-27 15:32:30 +01:00
lart.c [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
leds-assabet.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-badge4.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-cerf.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-hackkit.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-lart.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-simpad.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
leds.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile [ARM] Convert SA1111 to use clock architecture 2006-03-21 22:05:53 +00:00
Makefile.boot Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
neponset.c [ARM] Fix Neponset IRQ handling 2006-06-08 17:59:31 +01:00
pleb.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00
pm.c [ARM] Remove SA1100 PM prepare/finish ops 2006-01-04 15:55:41 +00:00
shannon.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
simpad.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sleep.S [ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ 2006-06-25 12:01:48 +01:00
ssp.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
time.c [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling 2006-07-01 22:32:38 +01:00