Russell King 938c0ace3f Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable ...

Conflicts:
	arch/arm/mach-pxa/tosa.c

2011-03-26 10:03:03 +00:00

..

at91_cf.c

…

au1000_generic.c

pcmcia: don't call flush_scheduled_work() spuriously

2010-10-16 11:07:37 +02:00

au1000_generic.h

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

au1000_pb1x00.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

bcm63xx_pcmcia.c

…

bcm63xx_pcmcia.h

…

bfin_cf_pcmcia.c

…

cardbus.c

…

cirrus.h

…

cistpl.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

cs_internal.h

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

cs.c

pcmcia: fix unused function compile warning

2010-10-14 11:47:16 +02:00

db1xxx_ss.c

…

ds.c

pcmcia: move driver name to struct pcmcia_driver

2010-09-29 17:20:24 +02:00

electra_cf.c

dt: Eliminate of_platform_{,un}register_driver

2011-02-28 13:22:46 -07:00

i82092.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

i82092aa.h

…

i82365.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

i82365.h

…

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

m8xx_pcmcia.c

dt: Eliminate of_platform_{,un}register_driver

2011-02-28 13:22:46 -07:00

m32r_cfc.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

m32r_cfc.h

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

m32r_pcc.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

m32r_pcc.h

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

Makefile

Merge branch 'devel-stable' into devel

2011-01-06 22:33:32 +00:00

o2micro.h

pcmcia/yenta: guide users in case of problems with O2-bridges

2010-10-15 14:31:47 +02:00

omap_cf.c

…

pcmcia_cis.c

pcmcia: use autoconfiguration feature for ioports and iomem

2010-09-29 17:20:24 +02:00

pcmcia_resource.c

pcmcia: re-enable Zoomed Video support

2011-02-20 12:47:34 +01:00

pd6729.c

pd6729: Coding Style fixes

2010-11-10 14:29:09 +01:00

pd6729.h

pd6729: Coding Style fixes

2010-11-10 14:29:09 +01:00

pxa2xx_balloon3.c

ARM: pxa: Update Balloon3 for new FPGA firmware

2010-12-20 23:14:02 +08:00

pxa2xx_base.c

pcmcia vs. MECR on pxa25x/sa1111

2011-02-19 12:22:35 +01:00

pxa2xx_base.h

pcmcia vs. MECR on pxa25x/sa1111

2011-02-19 12:22:35 +01:00

pxa2xx_cm_x2xx.c

…

pxa2xx_cm_x255.c

…

pxa2xx_cm_x270.c

…

pxa2xx_colibri.c

ARM: pxa: Use gpio arrays in colibri_pcmcia driver

2011-03-16 16:32:45 +08:00

pxa2xx_e740.c

…

pxa2xx_lubbock.c

pcmcia vs. MECR on pxa25x/sa1111

2011-02-19 12:22:35 +01:00

pxa2xx_mainstone.c

…

pxa2xx_palmld.c

ARM: pxa: Update copyright notices for Palm devices

2011-03-16 16:32:46 +08:00

pxa2xx_palmtc.c

ARM: pxa: Update copyright notices for Palm devices

2011-03-16 16:32:46 +08:00

pxa2xx_palmtx.c

ARM: pxa: Update copyright notices for Palm devices

2011-03-16 16:32:46 +08:00

pxa2xx_sharpsl.c

pcmcia/sa1100: don't put machine specific init functions in .init.text

2010-11-10 14:30:01 +01:00

pxa2xx_stargate2.c

…

pxa2xx_trizeps4.c

…

pxa2xx_viper.c

…

pxa2xx_vpac270.c

ARM: pxa: Update copyright notices for Palm devices

2011-03-16 16:32:46 +08:00

ricoh.h

…

rsrc_iodyn.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

rsrc_mgr.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

rsrc_nonstatic.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

sa11xx_base.c

…

sa11xx_base.h

…

sa1100_assabet.c

pcmcia/sa1100: don't put machine specific init functions in .init.text

2010-11-10 14:30:01 +01:00

sa1100_badge4.c

…

sa1100_cerf.c

pcmcia/sa1100: don't put machine specific init functions in .init.text

2010-11-10 14:30:01 +01:00

sa1100_generic.c

Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel

2011-01-05 18:08:10 +00:00

sa1100_generic.h

ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.

2010-12-21 14:53:45 +00:00

sa1100_h3600.c

pcmcia/sa1100: don't put machine specific init functions in .init.text

2010-11-10 14:30:01 +01:00

sa1100_jornada720.c

…

sa1100_nanoengine.c

ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.

2010-12-21 14:53:45 +00:00

sa1100_neponset.c

…

sa1100_shannon.c

pcmcia/sa1100: don't put machine specific init functions in .init.text

2010-11-10 14:30:01 +01:00

sa1100_simpad.c

pcmcia/sa1100: don't put machine specific init functions in .init.text

2010-11-10 14:30:01 +01:00

sa1111_generic.c

…

sa1111_generic.h

…

soc_common.c

Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel

2011-01-05 18:08:10 +00:00

soc_common.h

ARM: pxa: remove get_memclk_frequency_10khz()

2010-12-16 14:31:19 +08:00

socket_sysfs.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

tcic.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

tcic.h

…

ti113x.h

…

topic.h

…

vg468.h

…

vrc4171_card.c

…

vrc4173_cardu.c

pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable_device

2010-10-05 15:49:51 +02:00

vrc4173_cardu.h

…

xxs1500_ss.c

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29 17:20:23 +02:00

yenta_socket.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

yenta_socket.h

…