Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 08:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
5e8cb1e441
linux/drivers/pcmcia
History
Linus Torvalds cea8f46c36 Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 
Pull ARM updates from Russell King:
 "First ARM push of this merge window, post me coming back from holiday.
  This is what has been in linux-next for the last few weeks.  Not much
  to say which isn't described by the commit summaries."

* 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (32 commits)
  ARM: 7463/1: topology: Update cpu_power according to DT information
  ARM: 7462/1: topology: factorize the update of sibling masks
  ARM: 7461/1: topology: Add arch_scale_freq_power function
  ARM: 7456/1: ptrace: provide separate functions for tracing syscall {entry,exit}
  ARM: 7455/1: audit: move syscall auditing until after ptrace SIGTRAP handling
  ARM: 7454/1: entry: don't bother with syscall tracing on ret_from_fork path
  ARM: 7453/1: audit: only allow syscall auditing for pure EABI userspace
  ARM: 7452/1: delay: allow timer-based delay implementation to be selected
  ARM: 7451/1: arch timer: implement read_current_timer and get_cycles
  ARM: 7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs
  ARM: 7449/1: use generic strnlen_user and strncpy_from_user functions
  ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration
  ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines
  ARM: 7446/1: spinlock: use ticket algorithm for ARMv6+ locking implementation
  ARM: 7445/1: mm: update CONTEXTIDR register to contain PID of current process
  ARM: 7444/1: kernel: add arch-timer C3STOP feature
  ARM: 7460/1: remove asm/locks.h
  ARM: 7439/1: head.S: simplify initial page table mapping
  ARM: 7437/1: zImage: Allow DTB command line concatenation with ATAG_CMDLINE
  ARM: 7436/1: Do not map the vectors page as write-through on UP systems
  ...
2012-07-27 15:14:26 -07:00
..
at91_cf.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
bcm63xx_pcmcia.c pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE 2012-03-03 14:43:37 +01:00
bcm63xx_pcmcia.h MIPS: BCM63xx: Add PCMCIA & Cardbus support. 2009-09-30 21:47:01 +02:00
bfin_cf_pcmcia.c pcmcia: convert drivers/pcmcia/* to use module_platform_driver() 2012-03-03 14:43:37 +01:00
cardbus.c PCI: replace struct pci_bus secondary/subordinate with busn_res 2012-06-13 15:42:22 -06:00
cirrus.h pcmcia: drop already defined PCI_IDs 2009-10-24 17:13:01 +02:00
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 Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
db1xxx_ss.c pcmcia: convert drivers/pcmcia/* to use module_platform_driver() 2012-03-03 14:43:37 +01:00
ds.c Merge 3.3-rc6 into driver-core-next 2012-03-09 12:35:53 -08:00
electra_cf.c pcmcia: convert drivers/pcmcia/* to use module_platform_driver() 2012-03-03 14:43:37 +01:00
i82092.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
i82092aa.h
i82365.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
i82365.h pcmcia: honor saved flags in yenta_socket's I365_CSCINT register 2010-03-15 14:50:15 +01:00
Kconfig pcmcia: add driver for hx4700 2012-05-07 09:56:39 +08:00
m8xx_pcmcia.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
m32r_cfc.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
m32r_cfc.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
m32r_pcc.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
m32r_pcc.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
Makefile pcmcia: add driver for hx4700 2012-05-07 09:56:39 +08: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: replace struct irq with uint pcmcia_irq in struct pcmcia_socket 2010-05-10 10:23:12 +02:00
pcmcia_cis.c pcmcia: use autoconfiguration feature for ioports and iomem 2010-09-29 17:20:24 +02:00
pcmcia_resource.c Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
pd6729.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
pd6729.h pd6729: Coding Style fixes 2010-11-10 14:29:09 +01:00
pxa2xx_balloon3.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_base.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
pxa2xx_base.h pcmcia vs. MECR on pxa25x/sa1111 2011-02-19 12:22:35 +01:00
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_hx4700.c pcmcia: add driver for hx4700 2012-05-07 09:56:39 +08: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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07: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 treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +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 treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
sa11xx_base.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07: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: 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 pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data 2011-05-06 07:46:11 +02:00
sa1100_generic.h ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support. 2010-12-21 14:53:45 +00:00
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 ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01: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 'platforms' of git://git.linaro.org/people/rmk/linux-arm 2012-03-27 18:17:02 -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 Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm 2012-03-27 18:17:02 -07:00
soc_common.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
soc_common.h PCMCIA: soc_common: remove soc_pcmcia_*_irqs functions 2012-02-21 14:27:03 +00:00
socket_sysfs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
tcic.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
tcic.h
ti113x.h Fix common misspellings 2011-03-31 11:26:23 -03: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 pcmcia: use dev_pm_ops for class pcmcia_socket_class 2010-03-24 11:00:11 +01:00
vrc4173_cardu.c pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE 2012-03-03 14:43:37 +01:00
vrc4173_cardu.h
xxs1500_ss.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
yenta_socket.c PCI: replace struct pci_bus secondary/subordinate with busn_res 2012-06-13 15:42:22 -06:00
yenta_socket.h