You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Russell King
404a02cbd2
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
|
14 years ago |
| .. |
|
Kconfig
|
ARM: pxa: Colibri PXA320 PCMCIA driver
|
14 years ago |
|
Makefile
|
Merge branch 'devel-stable' into devel
|
14 years ago |
|
at91_cf.c
|
…
|
|
|
au1000_generic.c
|
…
|
|
|
au1000_generic.h
|
…
|
|
|
au1000_pb1x00.c
|
…
|
|
|
bcm63xx_pcmcia.c
|
…
|
|
|
bcm63xx_pcmcia.h
|
…
|
|
|
bfin_cf_pcmcia.c
|
…
|
|
|
cardbus.c
|
…
|
|
|
cirrus.h
|
…
|
|
|
cistpl.c
|
…
|
|
|
cs.c
|
…
|
|
|
cs_internal.h
|
…
|
|
|
db1xxx_ss.c
|
…
|
|
|
ds.c
|
…
|
|
|
electra_cf.c
|
…
|
|
|
i82092.c
|
…
|
|
|
i82092aa.h
|
…
|
|
|
i82365.c
|
…
|
|
|
i82365.h
|
…
|
|
|
m8xx_pcmcia.c
|
…
|
|
|
m32r_cfc.c
|
…
|
|
|
m32r_cfc.h
|
…
|
|
|
m32r_pcc.c
|
…
|
|
|
m32r_pcc.h
|
…
|
|
|
o2micro.h
|
…
|
|
|
omap_cf.c
|
…
|
|
|
pcmcia_cis.c
|
…
|
|
|
pcmcia_resource.c
|
pcmcia: IOCARD is also required for using IRQs
|
14 years ago |
|
pd6729.c
|
pd6729: Coding Style fixes
|
14 years ago |
|
pd6729.h
|
pd6729: Coding Style fixes
|
14 years ago |
|
pxa2xx_balloon3.c
|
ARM: pxa: Update Balloon3 for new FPGA firmware
|
14 years ago |
|
pxa2xx_base.c
|
ARM: pxa: Add pxa320 PCMCIA check
|
14 years ago |
|
pxa2xx_base.h
|
…
|
|
|
pxa2xx_cm_x2xx.c
|
…
|
|
|
pxa2xx_cm_x255.c
|
…
|
|
|
pxa2xx_cm_x270.c
|
…
|
|
|
pxa2xx_colibri.c
|
ARM: pxa: Colibri PXA320 PCMCIA driver
|
14 years ago |
|
pxa2xx_e740.c
|
…
|
|
|
pxa2xx_lubbock.c
|
…
|
|
|
pxa2xx_mainstone.c
|
…
|
|
|
pxa2xx_palmld.c
|
…
|
|
|
pxa2xx_palmtc.c
|
…
|
|
|
pxa2xx_palmtx.c
|
…
|
|
|
pxa2xx_sharpsl.c
|
pcmcia/sa1100: don't put machine specific init functions in .init.text
|
14 years ago |
|
pxa2xx_stargate2.c
|
…
|
|
|
pxa2xx_trizeps4.c
|
…
|
|
|
pxa2xx_viper.c
|
…
|
|
|
pxa2xx_vpac270.c
|
…
|
|
|
ricoh.h
|
…
|
|
|
rsrc_iodyn.c
|
…
|
|
|
rsrc_mgr.c
|
…
|
|
|
rsrc_nonstatic.c
|
…
|
|
|
sa11xx_base.c
|
…
|
|
|
sa11xx_base.h
|
…
|
|
|
sa1100_assabet.c
|
pcmcia/sa1100: don't put machine specific init functions in .init.text
|
14 years ago |
|
sa1100_badge4.c
|
…
|
|
|
sa1100_cerf.c
|
pcmcia/sa1100: don't put machine specific init functions in .init.text
|
14 years ago |
|
sa1100_generic.c
|
Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel
|
14 years ago |
|
sa1100_generic.h
|
ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.
|
14 years ago |
|
sa1100_h3600.c
|
pcmcia/sa1100: don't put machine specific init functions in .init.text
|
14 years ago |
|
sa1100_jornada720.c
|
…
|
|
|
sa1100_nanoengine.c
|
ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.
|
14 years ago |
|
sa1100_neponset.c
|
…
|
|
|
sa1100_shannon.c
|
pcmcia/sa1100: don't put machine specific init functions in .init.text
|
14 years ago |
|
sa1100_simpad.c
|
pcmcia/sa1100: don't put machine specific init functions in .init.text
|
14 years ago |
|
sa1111_generic.c
|
…
|
|
|
sa1111_generic.h
|
…
|
|
|
soc_common.c
|
Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel
|
14 years ago |
|
soc_common.h
|
ARM: pxa: remove get_memclk_frequency_10khz()
|
14 years ago |
|
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
|
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
|
14 years ago |
|
yenta_socket.h
|
…
|
|
