Linus Torvalds
4964e0664c
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
MIPS: Delete unused function add_temporary_entry.
MIPS: Set default pci cache line size.
MIPS: Flush huge TLB
MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
MIPS: Octeon: Add support for OCTEON II PCIe
MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
MIPS: Alchemy: Update cpu-feature-overrides
MIPS: Alchemy: db1200: Improve PB1200 detection.
MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
MIPS: Alchemy: irq: register pm at irq init time
MIPS: Alchemy: Touchscreen support on DB1100
MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
net/irda: convert au1k_ir to platform driver.
MIPS: Alchemy: remove unused board headers
MTD: nand: make au1550nd.c a platform_driver
MIPS: Netlogic: Mark Netlogic chips as SMT capable
MIPS: Netlogic: Add support for XLP 3XX cores
MIPS: Netlogic: Merge some of XLR/XLP wakup code
MIPS: Netlogic: Add default XLP config.
...
Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile
|
2012-01-14 13:05:21 -08:00 |
| .. |
|
at91_cf.c
|
treewide: Convert uses of struct resource to resource_size(ptr)
|
2011-06-10 14:55:36 +02:00 |
|
bcm63xx_pcmcia.c
|
|
|
|
bcm63xx_pcmcia.h
|
|
|
|
bfin_cf_pcmcia.c
|
drivers: Final irq namespace conversion
|
2011-03-29 14:48:19 +02:00 |
|
cardbus.c
|
|
|
|
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
|
pcmcia: Make declaration and uses of struct pcmcia_device_id const
|
2011-05-06 07:46:15 +02:00 |
|
electra_cf.c
|
treewide: Convert uses of struct resource to resource_size(ptr)
|
2011-06-10 14:55:36 +02:00 |
|
i82092.c
|
Fix common misspellings
|
2011-03-31 11:26:23 -03:00 |
|
i82092aa.h
|
|
|
|
i82365.c
|
|
|
|
i82365.h
|
|
|
|
Kconfig
|
MIPS: Alchemy: Basic support for the DB1300 board.
|
2011-12-07 22:02:06 +00:00 |
|
m8xx_pcmcia.c
|
dt: Eliminate of_platform_{,un}register_driver
|
2011-02-28 13:22:46 -07:00 |
|
m32r_cfc.c
|
|
|
|
m32r_cfc.h
|
tree-wide: fix comment/printk typos
|
2010-11-01 15:38:34 -04:00 |
|
m32r_pcc.c
|
|
|
|
m32r_pcc.h
|
tree-wide: fix comment/printk typos
|
2010-11-01 15:38:34 -04:00 |
|
Makefile
|
MIPS: Alchemy: remove PB1000 support
|
2011-12-07 22:02:05 +00:00 |
|
o2micro.h
|
|
|
|
omap_cf.c
|
|
|
|
pcmcia_cis.c
|
|
|
|
pcmcia_resource.c
|
Revert wrong fixes for common misspellings
|
2011-04-26 23:31:11 -07: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: use correct __iomem annotations
|
2011-10-08 21:03:07 +08:00 |
|
pxa2xx_base.c
|
ARM: PXA: fix lubbock PCMCIA driver build error
|
2011-11-05 19:09:40 +00: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
|
driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq()
|
2011-11-15 19:09:56 +08:00 |
|
pxa2xx_cm_x270.c
|
driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq()
|
2011-11-15 19:09:56 +08:00 |
|
pxa2xx_colibri.c
|
pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
|
2011-07-29 17:55:13 +02:00 |
|
pxa2xx_e740.c
|
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
|
2011-12-28 10:14:04 +00:00 |
|
pxa2xx_lubbock.c
|
Fix common misspellings
|
2011-03-31 11:26:23 -03:00 |
|
pxa2xx_mainstone.c
|
pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
|
2011-07-29 17:55:13 +02:00 |
|
pxa2xx_palmld.c
|
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
|
2011-12-28 10:14:04 +00:00 |
|
pxa2xx_palmtc.c
|
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
|
2011-12-28 10:14:04 +00:00 |
|
pxa2xx_palmtx.c
|
pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
|
2011-07-29 17:55:13 +02:00 |
|
pxa2xx_sharpsl.c
|
ARM: scoop: drop pcmcia_init callback
|
2011-07-11 14:43:32 +08:00 |
|
pxa2xx_stargate2.c
|
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
|
2011-12-28 10:14:04 +00:00 |
|
pxa2xx_trizeps4.c
|
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
|
2011-12-28 10:14:04 +00:00 |
|
pxa2xx_viper.c
|
pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
|
2011-07-29 17:55:13 +02:00 |
|
pxa2xx_vpac270.c
|
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
|
2011-12-28 10:14: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
|
|
|
|
rsrc_nonstatic.c
|
treewide: Convert uses of struct resource to resource_size(ptr)
|
2011-06-10 14:55:36 +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
|
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/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
|
drivers: Final irq namespace conversion
|
2011-03-29 14:48:19 +02: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
|
ARM: 7024/1: simpad: Cleanup CS3 accessors.
|
2011-10-17 09:12:42 +01:00 |
|
sa1111_generic.c
|
|
|
|
sa1111_generic.h
|
|
|
|
soc_common.c
|
drivers:pcmcia:soc_common: make socket_init and socket_suspend optional
|
2011-07-29 17:55:10 +02:00 |
|
soc_common.h
|
ARM: pxa: remove get_memclk_frequency_10khz()
|
2010-12-16 14:31:19 +08:00 |
|
socket_sysfs.c
|
|
|
|
tcic.c
|
|
|
|
tcic.h
|
|
|
|
ti113x.h
|
Fix common misspellings
|
2011-03-31 11:26:23 -03:00 |
|
topic.h
|
|
|
|
vg468.h
|
|
|
|
vrc4171_card.c
|
|
|
|
vrc4173_cardu.c
|
|
|
|
vrc4173_cardu.h
|
|
|
|
xxs1500_ss.c
|
drivers: Final irq namespace conversion
|
2011-03-29 14:48:19 +02:00 |
|
yenta_socket.c
|
module_param: make bool parameters really bool (drivers & misc)
|
2012-01-13 09:32:20 +10:30 |
|
yenta_socket.h
|
|
|