kevin/linux
1
Fork 0
Code
f63e115fb5
linux/arch/arm/mach-omap1
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
..
board-ams-delta.c ARM: OMAP: Readd Amstrad Delta USB support 2006-06-26 16:16:01 -07:00
board-fsample.c ARM: OMAP: Add core fsample support 2006-06-26 16:16:03 -07:00
board-generic.c [ARM] 3433/1: ARM: OMAP: 8/8 Update board files 2006-04-02 17:46:30 +01:00
board-h2.c [ARM] 3433/1: ARM: OMAP: 8/8 Update board files 2006-04-02 17:46:30 +01:00
board-h3.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
board-innovator.c ARM: OMAP: Add bitbank SPI driver for Innovator 1510 touchscreen 2006-06-26 16:16:09 -07:00
board-nokia770.c [ARM] 3433/1: ARM: OMAP: 8/8 Update board files 2006-04-02 17:46:30 +01:00
board-osk.c Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
board-palmte.c [ARM] 3433/1: ARM: OMAP: 8/8 Update board files 2006-04-02 17:46:30 +01:00
board-perseus2.c [ARM] 3433/1: ARM: OMAP: 8/8 Update board files 2006-04-02 17:46:30 +01:00
board-voiceblue.c [ARM] 3433/1: ARM: OMAP: 8/8 Update board files 2006-04-02 17:46:30 +01:00
clock.c ARM: OMAP: Add core fsample support 2006-06-26 16:16:03 -07:00
clock.h
devices.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
fpga.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
id.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
io.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
irq.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Kconfig ARM: OMAP: Add core fsample support 2006-06-26 16:16:03 -07:00
leds-h2p2-debug.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-innovator.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-osk.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds.c
leds.h
Makefile ARM: OMAP: Add core fsample support 2006-06-26 16:16:03 -07:00
Makefile.boot
mux.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
pm.c ARM: OMAP: Add core fsample support 2006-06-26 16:16:03 -07:00
serial.c [ARM] 3693/1: ARM: Convert omap1 to generic irq handling 2006-07-01 22:32:35 +01:00
sleep.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
time.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00