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
|
||
|---|---|---|
| .. | ||
| hardware | ||
| mach | ||
| a.out-core.h | ||
| a.out.h | ||
| asm-offsets.h | ||
| assembler.h | ||
| atomic.h | ||
| auxvec.h | ||
| bitops.h | ||
| bitsperlong.h | ||
| bug.h | ||
| bugs.h | ||
| byteorder.h | ||
| cache.h | ||
| cacheflush.h | ||
| cachetype.h | ||
| checksum.h | ||
| clkdev.h | ||
| cpu-multi32.h | ||
| cpu-single.h | ||
| cpu.h | ||
| cputime.h | ||
| cputype.h | ||
| current.h | ||
| delay.h | ||
| device.h | ||
| div64.h | ||
| dma-mapping.h | ||
| dma.h | ||
| domain.h | ||
| ecard.h | ||
| elf.h | ||
| emergency-restart.h | ||
| entry-macro-vic2.S | ||
| errno.h | ||
| fb.h | ||
| fcntl.h | ||
| fiq.h | ||
| fixmap.h | ||
| flat.h | ||
| floppy.h | ||
| fpstate.h | ||
| ftrace.h | ||
| futex.h | ||
| glue.h | ||
| gpio.h | ||
| hardirq.h | ||
| highmem.h | ||
| hw_irq.h | ||
| hwcap.h | ||
| ide.h | ||
| io.h | ||
| ioctl.h | ||
| ioctls.h | ||
| ipcbuf.h | ||
| irq_regs.h | ||
| irq.h | ||
| irqflags.h | ||
| Kbuild | ||
| kdebug.h | ||
| kexec.h | ||
| kgdb.h | ||
| kmap_types.h | ||
| kprobes.h | ||
| leds.h | ||
| limits.h | ||
| linkage.h | ||
| local64.h | ||
| local.h | ||
| localtimer.h | ||
| locks.h | ||
| mach-types.h | ||
| mc146818rtc.h | ||
| memblock.h | ||
| memory.h | ||
| mman.h | ||
| mmu_context.h | ||
| mmu.h | ||
| module.h | ||
| msgbuf.h | ||
| mtd-xip.h | ||
| mutex.h | ||
| nwflash.h | ||
| outercache.h | ||
| page-nommu.h | ||
| page.h | ||
| param.h | ||
| parport.h | ||
| pci.h | ||
| percpu.h | ||
| perf_event.h | ||
| pgalloc.h | ||
| pgtable-hwdef.h | ||
| pgtable-nommu.h | ||
| pgtable.h | ||
| pmu.h | ||
| poll.h | ||
| posix_types.h | ||
| proc-fns.h | ||
| processor.h | ||
| procinfo.h | ||
| ptrace.h | ||
| resource.h | ||
| scatterlist.h | ||
| sections.h | ||
| segment.h | ||
| sembuf.h | ||
| serial.h | ||
| setup.h | ||
| shmbuf.h | ||
| shmparam.h | ||
| sigcontext.h | ||
| siginfo.h | ||
| signal.h | ||
| sizes.h | ||
| smp_plat.h | ||
| smp_scu.h | ||
| smp_twd.h | ||
| smp.h | ||
| socket.h | ||
| sockios.h | ||
| sparsemem.h | ||
| spinlock_types.h | ||
| spinlock.h | ||
| stackprotector.h | ||
| stacktrace.h | ||
| stat.h | ||
| statfs.h | ||
| string.h | ||
| swab.h | ||
| system.h | ||
| tcm.h | ||
| termbits.h | ||
| termios.h | ||
| therm.h | ||
| thread_info.h | ||
| thread_notify.h | ||
| timex.h | ||
| tlb.h | ||
| tlbflush.h | ||
| tls.h | ||
| topology.h | ||
| traps.h | ||
| types.h | ||
| uaccess.h | ||
| ucontext.h | ||
| unaligned.h | ||
| unified.h | ||
| unistd.h | ||
| unwind.h | ||
| user.h | ||
| vfp.h | ||
| vfpmacros.h | ||
| vga.h | ||
| xor.h | ||