forked from luck/tmp_suning_uos_patched
636d17427b
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
ARM: 6322/1: imx/pca100: Fix name of spi platform data
ARM: 6321/1: fix syntax error in main Kconfig file
ARM: 6297/1: move U300 timer to dynamic clock lookup
ARM: 6296/1: clock U300 intcon and timer properly
ARM: 6295/1: fix U300 apb_pclk split
ARM: 6306/1: fix inverted MMC card detect in U300
ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
ARM: 6292/1: coresight: add ETM management registers
ARM: 6288/1: ftrace: document mcount formats
ARM: 6287/1: ftrace: clean up mcount assembly indentation
ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h>
ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
ARM: S5PV210: Override FIMC driver name on Aquila board
ARM: S5PC100: enable FIMC on SMDKC100
...
Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
different subsystem 'setname' calls, and trivial port types in
include/linux/serial_core.h
|
||
|---|---|---|
| .. | ||
| cpm_uart | ||
| jsm | ||
| 8250_accent.c | ||
| 8250_acorn.c | ||
| 8250_boca.c | ||
| 8250_early.c | ||
| 8250_exar_st16c554.c | ||
| 8250_fourport.c | ||
| 8250_gsc.c | ||
| 8250_hp300.c | ||
| 8250_hub6.c | ||
| 8250_mca.c | ||
| 8250_pci.c | ||
| 8250_pnp.c | ||
| 8250.c | ||
| 8250.h | ||
| 21285.c | ||
| 68328serial.c | ||
| 68328serial.h | ||
| 68360serial.c | ||
| altera_jtaguart.c | ||
| altera_uart.c | ||
| amba-pl010.c | ||
| amba-pl011.c | ||
| apbuart.c | ||
| apbuart.h | ||
| atmel_serial.c | ||
| bcm63xx_uart.c | ||
| bfin_5xx.c | ||
| bfin_sport_uart.c | ||
| bfin_sport_uart.h | ||
| clps711x.c | ||
| crisv10.c | ||
| crisv10.h | ||
| dz.c | ||
| dz.h | ||
| icom.c | ||
| icom.h | ||
| imx.c | ||
| ioc3_serial.c | ||
| ioc4_serial.c | ||
| ip22zilog.c | ||
| ip22zilog.h | ||
| Kconfig | ||
| kgdboc.c | ||
| m32r_sio_reg.h | ||
| m32r_sio.c | ||
| m32r_sio.h | ||
| Makefile | ||
| max3100.c | ||
| max3107-aava.c | ||
| max3107.c | ||
| max3107.h | ||
| mcf.c | ||
| mfd.c | ||
| mpc52xx_uart.c | ||
| mpsc.c | ||
| mrst_max3110.c | ||
| mrst_max3110.h | ||
| msm_serial.c | ||
| msm_serial.h | ||
| mux.c | ||
| netx-serial.c | ||
| nwpserial.c | ||
| of_serial.c | ||
| pmac_zilog.c | ||
| pmac_zilog.h | ||
| pnx8xxx_uart.c | ||
| pxa.c | ||
| s3c24a0.c | ||
| s3c2400.c | ||
| s3c2410.c | ||
| s3c2412.c | ||
| s3c2440.c | ||
| s3c6400.c | ||
| s5pv210.c | ||
| sa1100.c | ||
| samsung.c | ||
| samsung.h | ||
| sb1250-duart.c | ||
| sc26xx.c | ||
| serial_core.c | ||
| serial_cs.c | ||
| serial_ks8695.c | ||
| serial_lh7a40x.c | ||
| serial_txx9.c | ||
| sh-sci.c | ||
| sh-sci.h | ||
| sn_console.c | ||
| suncore.c | ||
| suncore.h | ||
| sunhv.c | ||
| sunsab.c | ||
| sunsab.h | ||
| sunsu.c | ||
| sunzilog.c | ||
| sunzilog.h | ||
| timbuart.c | ||
| timbuart.h | ||
| uartlite.c | ||
| ucc_uart.c | ||
| vr41xx_siu.c | ||
| zs.c | ||
| zs.h | ||