Linus Torvalds 1c496784a0 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 ... * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits) arm: omap: Add omap3_defconfig AM35xx: Defconfig for AM3517 EVM board AM35xx: Add support for AM3517 EVM board omap: 3630sdp: defconfig creation omap: 3630sdp: introduce 3630 sdp board support omap3: Add defconfig for IGEP v2 board omap3: Add minimal IGEP v2 support omap3: Add CompuLab CM-T35 defconfig omap3: Add CompuLab CM-T35 board support omap3: rx51: Add wl1251 wlan driver support omap3: rx51: Add SDRAM init omap1: Add default kernel configuration for Herald omap1: Add board support and LCD for HTC Herald omap: zoom2: update defconfig for LL_DEBUG_NONE omap: zoom3: defconfig creation omap3: zoom: Introduce zoom3 board support omap3: zoom: Drop i2c-1 speed to 2400 omap3: zoom: rename zoom2 name to generic zoom omap3: zoom: split board file for software reuse omap3evm: MIgrate to smsc911x ethernet driver ... Fix trivial conflict (two unrelated config options added next to each other) in arch/arm/mach-omap2/Makefile		2009-12-08 08:15:29 -08:00
..
at91_cf.c	PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()	2009-09-29 00:10:41 +02:00
au1000_db1x00.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
au1000_generic.c	PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()	2009-09-29 00:10:41 +02:00
au1000_generic.h	pcmcia: encapsulate ioaddr_t	2008-08-29 09:43:14 +02:00
au1000_pb1x00.c	pcmcia: drop non-existant includes	2009-09-15 10:17:16 -07:00
au1000_xxs1500.c	pcmcia: drop non-existant includes	2009-09-15 10:17:16 -07:00
bcm63xx_pcmcia.c	MIPS: BCM63xx: Add PCMCIA & Cardbus support.	2009-09-30 21:47:01 +02:00
bcm63xx_pcmcia.h	MIPS: BCM63xx: Add PCMCIA & Cardbus support.	2009-09-30 21:47:01 +02:00
bfin_cf_pcmcia.c	PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()	2009-09-29 00:10:41 +02:00
cardbus.c	pcmcia: use dynamic debug instead of custom infrastructure	2009-11-08 18:23:12 +01:00
cirrus.h	pcmcia: drop already defined PCI_IDs	2009-10-24 17:13:01 +02:00
cistpl.c	pcmcia: use dynamic debug instead of custom infrastructure	2009-11-08 18:23:12 +01:00
cs_internal.h	pcmcia: move some window-related code to pcmcia_ioctl.c	2009-11-28 18:02:51 +01:00
cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-05 09:42:59 -08:00
ds.c	pcmcia: remove now-defunct cs_error, pcmcia_error_{func,ret}	2009-11-09 08:30:06 +01:00
electra_cf.c	powerpc: Change u64/s64 to a long long integer type	2009-01-13 14:47:59 +11:00
i82092.c	PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()	2009-09-29 00:10:41 +02:00
i82092aa.h	pcmcia: remove CVS keywords	2008-06-24 15:33:37 +02:00
i82365.c	pcmcia: use dynamic debug in PCMCIA socket drivers	2009-11-08 18:23:13 +01:00
i82365.h
Kconfig	Fix soc_common PCMCIA configuration	2009-12-06 16:58:50 +00:00
m8xx_pcmcia.c	pcmcia: use dynamic debug in PCMCIA socket drivers	2009-11-08 18:23:13 +01:00
m32r_cfc.c	pcmcia: use dynamic debug in PCMCIA socket drivers	2009-11-08 18:23:13 +01:00
m32r_cfc.h
m32r_pcc.c	pcmcia: use dynamic debug in PCMCIA socket drivers	2009-11-08 18:23:13 +01:00
m32r_pcc.h
Makefile	PCMCIA: soc_common: convert to a stand alone module	2009-11-09 08:30:08 +01:00
o2micro.h	pcmcia: drop already defined PCI_IDs	2009-10-24 17:13:01 +02:00
omap_cf.c	omap: headers: Move remaining headers from include/mach to include/plat	2009-10-20 09:40:47 -07:00
pcmcia_ioctl.c	pcmcia: remove unused "window_t" typedef	2009-11-28 18:02:52 +01:00
pcmcia_resource.c	pcmcia: rework the irq_req_t typedef	2009-11-28 18:03:14 +01:00
pd6729.c	pcmcia: use dev_dbg and dev_print in pd6729.c	2009-11-09 08:30:07 +01:00
pd6729.h	pcmcia: use dev_dbg and dev_print in pd6729.c	2009-11-09 08:30:07 +01:00
pxa2xx_base.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
pxa2xx_base.h	PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data	2009-11-09 08:30:11 +01:00
pxa2xx_cm_x2xx.c	[ARM] 5283/1: pxa: add CM-X255 pcmcia support	2008-10-07 12:08:02 +01:00
pxa2xx_cm_x255.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
pxa2xx_cm_x270.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
pxa2xx_e740.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
pxa2xx_lubbock.c	PCMCIA: sa1111: remove duplicated initializers	2009-11-09 08:30:12 +01:00
pxa2xx_mainstone.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
pxa2xx_palmld.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
pxa2xx_palmtc.c	[ARM] pxa/palm: fix possibly uninitialized variable in PalmTC-pcmcia	2009-09-10 18:49:36 +08:00
pxa2xx_palmtx.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
pxa2xx_sharpsl.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
pxa2xx_stargate2.c	[ARM] pxa/stargate2: add support for Compact Flash/PCMCIA	2009-06-05 10:46:32 +08:00
pxa2xx_trizeps4.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
pxa2xx_viper.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
ricoh.h
rsrc_mgr.c	pcmcia: add new CIS access helpers	2009-11-08 18:06:54 +01:00
rsrc_nonstatic.c	pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup	2009-10-19 00:29:36 +02:00
sa11xx_base.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
sa11xx_base.h	PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data	2009-11-09 08:30:11 +01:00
sa1100_assabet.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
sa1100_badge4.c	PCMCIA: sa1111: remove duplicated initializers	2009-11-09 08:30:12 +01:00
sa1100_cerf.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
sa1100_generic.c	ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100	2009-12-06 16:52:57 +00:00
sa1100_generic.h
sa1100_h3600.c	ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100	2009-12-06 16:52:57 +00:00
sa1100_jornada720.c	PCMCIA: sa1111: remove duplicated initializers	2009-11-09 08:30:12 +01:00
sa1100_neponset.c	PCMCIA: sa1111: remove duplicated initializers	2009-11-09 08:30:12 +01:00
sa1100_shannon.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
sa1100_simpad.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
sa1111_generic.c	drivers/pcmcia: remove unnecessary kzalloc	2009-11-22 13:03:50 +01:00
sa1111_generic.h	PCMCIA: sa1111: remove duplicated initializers	2009-11-09 08:30:12 +01:00
soc_common.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
soc_common.h	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	2009-11-09 08:30:16 +01:00
socket_sysfs.c	pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup	2009-10-19 00:29:36 +02:00
tcic.c	pcmcia: use dynamic debug in PCMCIA socket drivers	2009-11-08 18:23:13 +01:00
tcic.h
ti113x.h	pcmcia: use dev_printk and dev_dbg in yenta_socket	2008-08-23 01:49:44 +02:00
topic.h	pcmcia: correct handling for Zoomed Video registers in topic.h	2009-11-11 19:34:27 +01:00
vg468.h
vrc4171_card.c	PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()	2009-09-29 00:10:41 +02:00
vrc4173_cardu.c	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
vrc4173_cardu.h	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
yenta_socket.c	PM / yenta: Split resume into early and late parts (rev. 4)	2009-11-03 10:54:58 +01:00
yenta_socket.h	[PATCH] yenta: make ToPIC95 bridges work with 16bit cards	2005-09-07 16:57:21 -07:00