alistair23-linux/drivers/pcmcia
Linus Torvalds 66f03c614c ARM: device tree work
Most of these patches convert code from using static platform data to
 describing the hardware in the device tree. This is only the first
 half of the changes for v3.4 because a lot of patches for this topic
 came in the last week before the merge window.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIVAwUAT24/a2CrR//JCVInAQKYdxAAn+fs7yv+P4OWG/nIhGdnPw8MQ2u9fvqA
 pmNL3Jy0eVowbENDcRRZgfhZ3ZlWBGUYym7J1uiFSrmHyJPoMtMvVg0miPYxLlpE
 vr8bzuSfGOUOa7+Fk6kFVGxS3ZHZTsDvuhMQUIt/2jHgOaesqPvZ1FYFAj1bZ1fm
 2CnQoF3OfnWAngHtoBXtgJxp/1r7+pHlGVbPYpmtHtikl45NmhqWza58aSQBilr+
 S90cVeZs91gyveoxz5N+YrO8+Dx05te3mF+dwWuKC6aDC6d76fjLak54AvYv2Pzr
 I6iaQPV8GIsXi5R4wptmVQAc5mbk5oktxJ7hCIHrmaBiAXygoVAYoqcuumoO3QDb
 QKz10ga1yBYcKYrKvBzKxQrChw53IPU6po+Dd66ALJvLlc3KONksiJs5T/5Wma7P
 v3VPcmZwPrJQbz+fQu6FysHeYQY+wfiR5E9Yz2OXs+PtkSy9OYsFFirdhJeWUPgA
 ASjNLs1y5rxqrJBt7cjyQiBbIf1awGWyzF0yUNrlYHxmhJ6vcxHfrGoW38VRRCTM
 8+JcxOHPRYrPfY7we6zsOn7ZeTWJduoUEeTxDnVS3w3zUIKCvkvkpHaJDvHvYcui
 T/yJnXdUD2O3E5+5k/5cCyde8RbSB9gKsNpIMNkK5BLSmbux3C72dE0sMQFysahI
 hS8aDCDUQUU=
 =fMC+
 -----END PGP SIGNATURE-----

Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: device tree work" from Arnd Bergmann:
 "Most of these patches convert code from using static platform data to
  describing the hardware in the device tree.  This is only the first
  half of the changes for v3.4 because a lot of patches for this topic
  came in the last week before the merge window.

  Signed-off-by: Arnd Bergmann <arnd@arndb.de>"

Fix up trivial conflicts in arch/arm/mach-vexpress/{Kconfig,core.h}

* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (86 commits)
  Document: devicetree: add OF documents for arch-mmp
  ARM: dts: append DTS file of pxa168
  ARM: mmp: append OF support on pxa168
  ARM: mmp: enable rtc clk in pxa168
  i2c: pxa: add OF support
  serial: pxa: add OF support
  arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board
  ARM: OMAP2+: Remove extra ifdefs for board-generic
  ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected
  ASoC: DT: Add digital microphone binding to PAZ00 board.
  ARM: dt: Add ARM PMU to tegra*.dtsi
  ARM: at91: at91sam9x5cm/dt: add leds support
  ARM: at91: usb_a9g20/dt: add gpio-keys support
  ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support
  ARM: at91: at91sam9m10g45ek/dt: add leds support
  ARM: at91: usb_a9g20/dt: add leds support
  ARM: at91/pio: add new PIO3 features
  ARM: at91: add sam9_smc.o to at91sam9x5 build
  ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter
  ARM: at91/tc: add device tree support to atmel_tclib
  ...
2012-03-27 16:47:35 -07:00
..
at91_cf.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
bcm63xx_pcmcia.c
bcm63xx_pcmcia.h
bfin_cf_pcmcia.c
cardbus.c PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge 2012-02-27 12:14:55 -08:00
cirrus.h
cistpl.c
cs.c
cs_internal.h
db1xxx_ss.c MIPS: Alchemy: Basic support for the DB1300 board. 2011-12-07 22:02:06 +00:00
ds.c Merge 3.3-rc6 into driver-core-next 2012-03-09 12:35:53 -08:00
electra_cf.c
i82092.c
i82092aa.h
i82365.c
i82365.h
Kconfig PCMCIA: make lubbock socket driver part of sa1111_cs 2012-02-21 14:27:18 +00:00
m8xx_pcmcia.c
m32r_cfc.c
m32r_cfc.h
m32r_pcc.c
m32r_pcc.h
Makefile PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
o2micro.h
omap_cf.c
pcmcia_cis.c
pcmcia_resource.c
pd6729.c
pd6729.h
pxa2xx_balloon3.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_base.c Merge branch 'pcmcia' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:37:40 -07:00
pxa2xx_base.h
pxa2xx_cm_x2xx.c ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver 2011-11-05 22:26:46 +00:00
pxa2xx_cm_x255.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_cm_x270.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_colibri.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_e740.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_mainstone.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_palmld.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_palmtc.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_palmtx.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_sharpsl.c PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio management 2012-02-04 14:32:22 +00:00
pxa2xx_stargate2.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_trizeps4.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_viper.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_vpac270.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
ricoh.h
rsrc_iodyn.c
rsrc_mgr.c
rsrc_nonstatic.c
sa11xx_base.c PCMCIA: soc_common: move common initialization into soc_common 2012-01-26 19:57:17 +00:00
sa11xx_base.h
sa1100_assabet.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1100_cerf.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1100_generic.c
sa1100_generic.h
sa1100_h3600.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1100_nanoengine.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1100_shannon.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1100_simpad.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1111_badge4.c PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
sa1111_generic.c Merge branch 'pcmcia' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:37:40 -07:00
sa1111_generic.h PCMCIA: sa1111: use new per-socket irq/gpio infrastructure 2012-02-04 14:32:23 +00:00
sa1111_jornada720.c PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
sa1111_lubbock.c PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
sa1111_neponset.c PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
soc_common.c PCMCIA: soc_common: remove soc_pcmcia_*_irqs functions 2012-02-21 14:27:03 +00:00
soc_common.h PCMCIA: soc_common: remove soc_pcmcia_*_irqs functions 2012-02-21 14:27:03 +00:00
socket_sysfs.c
tcic.c
tcic.h
ti113x.h
topic.h
vg468.h
vrc4171_card.c
vrc4173_cardu.c
vrc4173_cardu.h
xxs1500_ss.c
yenta_socket.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
yenta_socket.h