android_kernel_motorola_sm6225/include
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
..
acpi Pull acpica into release branch 2006-06-29 19:55:27 -04:00
asm-alpha [PATCH] irq-flags: ALPHA: Use the new IRQF_ constants 2006-07-02 13:58:46 -07:00
asm-arm Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
asm-arm26 [PATCH] irq-flags: ARM26: Use the new IRQF_ constants 2006-07-02 13:58:46 -07:00
asm-cris [PATCH] irq-flags: CRIS: Use the new IRQF_ constants 2006-07-02 13:58:46 -07:00
asm-frv [PATCH] irq-flags: FRV: Use the new IRQF_ constants 2006-07-02 13:58:46 -07:00
asm-generic Merge branch 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current 2006-07-01 09:59:08 -07:00
asm-h8300 [PATCH] irq-flags: H8300: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
asm-i386 [PATCH] irq-flags: i386: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
asm-ia64 [PATCH] irq-flags: IA64: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
asm-m32r [PATCH] irq-flags: M32R: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
asm-m68k [PATCH] irq-flags: M68K: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
asm-m68knommu [PATCH] irq-flags: M68KNOMMU: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
asm-mips [PATCH] irq-flags: MIPS: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
asm-parisc [PATCH] irq-flags: PARISC: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
asm-powerpc [PATCH] irq-flags: POWERPC: Use the new IRQF_ constants 2006-07-02 13:58:47 -07:00
asm-ppc [PATCH] irq-flags: PPC: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
asm-s390 [PATCH] irq-flags: S390: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
asm-sh [PATCH] irq-flags: SH: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
asm-sh64 [PATCH] irq-flags: SH64: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
asm-sparc [PATCH] irq-flags: SPARC: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
asm-sparc64 [PATCH] irq-flags: SPARC64: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
asm-um [PATCH] uml: make copy_*_user atomic 2006-07-01 09:56:03 -07:00
asm-v850 [PATCH] irq-flags: V850: Use the new IRQF_ constants 2006-07-02 13:58:48 -07:00
asm-x86_64 [PATCH] irq-flags: x86_64: Use the new IRQF_ constants 2006-07-02 13:58:49 -07:00
asm-xtensa [PATCH] irq-flags: XTENSA: Use the new IRQF_ constants 2006-07-02 13:58:49 -07:00
keys [PATCH] keys: discard the contents of a key on revocation 2006-06-26 09:58:18 -07:00
linux Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
math-emu
media V4L/DVB (4270): Add tda9887-specific tuner configuration 2006-06-30 15:59:32 -03:00
mtd Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
net [PATCH] irq-flags: drivers/net: Use the new IRQF_ constants 2006-07-02 13:58:51 -07:00
pcmcia Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
rdma IB/uverbs: Don't serialize with ib_uverbs_idr_mutex 2006-06-17 20:44:49 -07:00
rxrpc
scsi Merge branch 'master' into upstream 2006-06-22 22:11:56 -04:00
sound [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
video Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00