lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
b4b9034132
linux-kernel-test/arch/arm/plat-omap
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
..
clock.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
common.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpu-omap.c ARM: OMAP: Update cpufreq support for 24xx 2006-06-26 16:16:17 -07:00
devices.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
dma.c Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
dmtimer.c [ARM] 3676/1: ARM: OMAP: Fix dmtimers and timer32k to compile on OMAP1 2006-07-01 19:56:42 +01:00
fb.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
gpio.c Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
Kconfig ARM: OMAP: Port dmtimers to OMAP2 and implement PWM support 2006-06-26 16:16:12 -07:00
Makefile [ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2 2006-04-02 17:46:27 +01:00
mcbsp.c [ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2 2006-04-02 17:46:27 +01:00
mux.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ocpi.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
pm.c [ARM] 3430/1: ARM: OMAP: 5/8 Update PM 2006-04-02 17:46:25 +01:00
sram-fn.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sram.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
timer32k.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
usb.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00