Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
ab13446616
linux/arch/arm
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
..
boot Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
common [ARM] 3686/1: ARM: arm/common: convert irq handling 2006-07-01 22:32:14 +01:00
configs [ARM] 3677/1: OMAP: Update H2 defconfig 2006-07-01 19:56:43 +01:00
kernel Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
lib Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-aaec2000 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-at91rm9200 Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
mach-clps711x [ARM] 3696/1: ARM: Convert clps711x to generic irq handling 2006-07-01 22:32:37 +01:00
mach-clps7500 [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling 2006-07-01 22:32:33 +01:00
mach-ebsa110 [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
mach-ep93xx Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
mach-footbridge [ARM] 3680/1: ARM: Convert footbridge to generic irq handling 2006-07-01 22:32:17 +01:00
mach-h720x Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-imx [ARM] 3691/1: ARM: Convert imx to generic irq handling 2006-07-01 22:32:34 +01:00
mach-integrator [ARM] 3687/1: ARM: Convert integrator to generic irq handling 2006-07-01 22:32:32 +01:00
mach-iop3xx Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
mach-ixp4xx [ARM] 3682/2: ARM: Convert ixp4xx to generic irq handling 2006-07-01 23:01:49 +01:00
mach-ixp23xx [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling 2006-07-01 22:32:42 +01:00
mach-ixp2000 [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling 2006-07-01 22:32:18 +01:00
mach-l7200 [ARM] 3684/1: ARM: Convert l7200 to generic irq handling 2006-07-01 22:32:19 +01:00
mach-lh7a40x [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling 2006-07-01 22:32:40 +01:00
mach-netx [ARM] Include asm/hardware.h not asm/arch/hardware.h 2006-06-20 19:53:16 +01:00
mach-omap1 Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
mach-omap2 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
mach-pnx4008 [ARM] 3623/1: pnx4008: move GPIO-related defines to gpio.h 2006-06-22 10:26:21 +01:00
mach-pxa Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
mach-realview Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-rpc [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
mach-s3c2410 [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling 2006-07-01 22:32:39 +01:00
mach-sa1100 Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
mach-shark [ARM] 3697/1: ARM: Convert shark to generic irq handling 2006-07-01 22:32:37 +01:00
mach-versatile Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mm Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:04:12 -07:00
nwfpe Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
oprofile [ARM] Use kcalloc to allocate counter_config array rather than kmalloc 2006-03-21 23:30:02 +00:00
plat-omap Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
tools [ARM] Update mach-types 2006-06-26 22:50:21 +01:00
vfp Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Kconfig Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
Kconfig-nommu [ARM] nommu: fixups for the exception vectors 2006-03-27 15:18:50 +01:00
Kconfig.debug [ARM] Trivial typo fixes 2006-06-04 21:22:11 +01:00
Makefile [ARM] 3675/2: Preparing for AT91SAM926 support 2006-06-29 16:06:33 +01:00