mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 18:11:56 +00:00
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
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| clock.c | ||
| cpu.c | ||
| cpufreq.c | ||
| dev-audio.c | ||
| dev-onenand1.c | ||
| dev-spi.c | ||
| dev-uart.c | ||
| dma.c | ||
| gpiolib.c | ||
| irq-eint.c | ||
| irq-pm.c | ||
| irq.c | ||
| Kconfig | ||
| mach-anw6410.c | ||
| mach-hmt.c | ||
| mach-ncp.c | ||
| mach-smartq5.c | ||
| mach-smartq7.c | ||
| mach-smartq.c | ||
| mach-smartq.h | ||
| mach-smdk6400.c | ||
| mach-smdk6410.c | ||
| Makefile | ||
| Makefile.boot | ||
| pm.c | ||
| s3c6400.c | ||
| s3c6410.c | ||
| setup-fb-24bpp.c | ||
| setup-i2c0.c | ||
| setup-i2c1.c | ||
| setup-ide.c | ||
| setup-keypad.c | ||
| setup-sdhci-gpio.c | ||
| setup-sdhci.c | ||
| sleep.S | ||