luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b4b9034132
tmp_suning_uos_patched/arch/arm/mach-at91rm9200
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
..
at91rm9200_time.c Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
at91rm9200.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
board-1arm.c [ARM] 3654/1: add ajeco 1arm sbc support 2006-06-26 17:48:29 +01:00
board-carmeva.c [ARM] Include asm/hardware.h not asm/arch/hardware.h 2006-06-20 19:53:16 +01:00
board-csb337.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
board-csb637.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
board-dk.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
board-eb9200.c [ARM] Include asm/hardware.h not asm/arch/hardware.h 2006-06-20 19:53:16 +01:00
board-ek.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
board-kafa.c [ARM] Include asm/hardware.h not asm/arch/hardware.h 2006-06-20 19:53:16 +01:00
board-kb9202.c [ARM] Include asm/hardware.h not asm/arch/hardware.h 2006-06-20 19:53:16 +01:00
clock.c [ARM] Include asm/hardware.h not asm/arch/hardware.h 2006-06-20 19:53:16 +01:00
devices.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
generic.h [ARM] 3605/1: AT91RM9200 Power Management 2006-06-20 19:30:19 +01:00
gpio.c [ARM] 3683/2: ARM: Convert at91rm9200 to generic irq handling 2006-07-01 23:01:50 +01:00
irq.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Kconfig [ARM] 3675/2: Preparing for AT91SAM926 support 2006-06-29 16:06:33 +01:00
leds.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Makefile [ARM] 3675/2: Preparing for AT91SAM926 support 2006-06-29 16:06:33 +01:00
Makefile.boot [ARM] 3240/2: AT91RM9200 support for 2.6 (Core) 2006-01-09 17:05:41 +00:00
pm.c [ARM] 3605/1: AT91RM9200 Power Management 2006-06-20 19:30:19 +01:00