kevin/linux
1
Fork 0
Code
f63e115fb5
linux/arch/arm/mach-pxa
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
..
akita-ioexp.c [PATCH] I2C: Remove .owner setting from i2c_driver as it's no longer needed 2006-01-05 22:16:25 -08:00
clock.c [ARM] Convert SA1111 to use clock architecture 2006-03-21 22:05:53 +00:00
corgi_lcd.c [ARM] Include asm/hardware.h instead of asm/arch/hardware.h 2005-11-16 14:51:20 +00:00
corgi_pm.c [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters 2006-06-19 19:58:52 +01:00
corgi_ssp.c [ARM] 3594/1: Poodle: Add touchscreen support + other updates 2006-06-19 20:46:05 +01:00
corgi.c [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds 2006-06-19 19:57:12 +01:00
dma.c [ARM] 3500/1: fix PXA27x DMA allocation priority 2006-05-05 22:32:24 +01:00
generic.c [PATCH] RTC subsystem: SA1100/PXA2XX driver 2006-03-27 08:44:52 -08:00
generic.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
idp.c [ARM] 3685/1: ARM: Convert pxa to generic irq handling 2006-07-01 22:32:20 +01:00
irq.c [ARM] 3672/1: PXA: don't probe output GPIOs for interrupt 2006-06-28 17:55:03 +01:00
Kconfig [ARM] 3666/1: TRIZEPS4 [1/5] core 2006-06-29 16:25:37 +01:00
leds-idp.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-lubbock.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-mainstone.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds-trizeps4.c [ARM] 3666/1: TRIZEPS4 [1/5] core 2006-06-29 16:25:37 +01:00
leds.c [ARM] 3666/1: TRIZEPS4 [1/5] core 2006-06-29 16:25:37 +01:00
leds.h [ARM] 3666/1: TRIZEPS4 [1/5] core 2006-06-29 16:25:37 +01:00
lpd270.c [ARM] 3673/1: lpd270: parse lcd= command line parameter 2006-06-29 16:06:30 +01:00
lubbock.c [ARM] 3534/1: add spi support to lubbock platform 2006-06-18 16:39:33 +01:00
mainstone.c [ARM] 3543/1: [Fwd: PXA270 bootparams address not set] 2006-06-05 19:47:17 +01:00
Makefile [ARM] 3666/1: TRIZEPS4 [1/5] core 2006-06-29 16:25:37 +01:00
Makefile.boot Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pm.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
poodle.c [ARM] 3594/1: Poodle: Add touchscreen support + other updates 2006-06-19 20:46:05 +01:00
pxa25x.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
pxa27x.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sharpsl_pm.c [ARM] 3685/1: ARM: Convert pxa to generic irq handling 2006-07-01 22:32:20 +01:00
sharpsl.h [ARM] 3235/1: SharpSL PM: Fix a gcc4 build error 2006-01-07 11:12:26 +00:00
sleep.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
spitz_pm.c [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters 2006-06-19 19:58:52 +01:00
spitz.c [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds 2006-06-19 19:57:12 +01:00
ssp.c [ARM] Convert some arm semaphores to mutexes 2006-01-12 18:42:23 +00:00
standby.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
time.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
tosa.c [ARM] Fix tosa build error 2006-06-20 23:27:37 +01:00
trizeps4.c [ARM] 3666/1: TRIZEPS4 [1/5] core 2006-06-29 16:25:37 +01:00