leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2e8a538d86
linux/drivers/pcmcia
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
..
at91_cf.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
au1000_db1x00.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
au1000_generic.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
au1000_generic.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
au1000_pb1x00.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
au1000_xxs1500.c
cardbus.c
cirrus.h
cistpl.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
cs_internal.h [PATCH] pcmcia: use bitfield instead of p_state and state 2006-03-31 17:26:33 +02:00
cs.c [PATCH] pcmcia: fix deadlock in pcmcia_parse_events 2006-06-30 22:09:13 +02:00
ds_internal.h [PATCH] pcmcia: remove export of pcmcia_release_configuration 2006-03-31 17:15:53 +02:00
ds.c [PATCH] pcmcia: missing pcmcia_get_socket() result check 2006-06-02 00:56:17 +02:00
hd64465_ss.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
i82092.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
i82092aa.h [PATCH] pcmcia: remove get_socket callback 2006-01-05 23:41:09 +01:00
i82365.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
i82365.h
Kconfig [PATCH] vrc4171: update config 2006-04-22 00:49:18 +02:00
m8xx_pcmcia.c [PATCH] spin/rwlock init cleanups 2006-06-27 17:32:39 -07:00
m32r_cfc.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
m32r_cfc.h
m32r_pcc.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
m32r_pcc.h
Makefile [PATCH] pcmcia: AT91RM9200 Compact Flash driver 2006-03-31 17:05:41 +02:00
o2micro.h
omap_cf.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
pcmcia_ioctl.c [PATCH] pcmcia Oopses fixes 2006-05-15 11:20:54 -07:00
pcmcia_resource.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
pd6729.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
pd6729.h
pxa2xx_base.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
pxa2xx_base.h
pxa2xx_lubbock.c
pxa2xx_mainstone.c [ARM] 3250/1: Change pxa2xx PCMCIA drivers to use platform_device_alloc 2006-01-10 17:16:12 +00:00
pxa2xx_sharpsl.c [ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure 2006-04-18 23:18:53 +01:00
ricoh.h
rsrc_mgr.c [PATCH] pcmcia: size reduction if ioctl isn't compiled 2006-03-31 17:02:39 +02:00
rsrc_nonstatic.c [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed 2006-06-27 09:24:00 -07:00
sa11xx_base.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sa11xx_base.h
sa1100_assabet.c
sa1100_badge4.c [ARM] Fix badge4 build error 2006-06-19 15:37:31 +01:00
sa1100_cerf.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
sa1100_generic.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sa1100_generic.h
sa1100_h3600.c
sa1100_jornada720.c
sa1100_neponset.c
sa1100_shannon.c
sa1100_simpad.c
sa1111_generic.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sa1111_generic.h
soc_common.c Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 2006-07-02 15:07:45 -07:00
soc_common.h
socket_sysfs.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
tcic.c [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers 2006-06-27 09:23:59 -07:00
tcic.h
ti113x.h [PATCH] pcmcia: TI PCIxx12 CardBus controller support 2006-06-30 22:09:11 +02:00
topic.h
vg468.h
vrc4171_card.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
vrc4173_cardu.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
vrc4173_cardu.h Update Yoichi Yuasa's email address. 2006-01-10 13:39:07 +00:00
yenta_socket.c [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
yenta_socket.h