Linus Torvalds 69f1d1a6ac Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ... * 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits) ARM: S5P64X0: External Interrupt Support ARM: EXYNOS4: Enable MFC on Samsung NURI ARM: EXYNOS4: Enable MFC on universal_c210 ARM: S5PV210: Enable MFC on Goni ARM: S5P: Add support for MFC device ARM: EXYNOS4: Add support FIMD on SMDKC210 ARM: EXYNOS4: Add platform device and helper functions for FIMD ARM: EXYNOS4: Add resource definition for FIMD ARM: EXYNOS4: Change devname for FIMD clkdev ARM: SAMSUNG: Add IRQ_I2S0 definition ARM: SAMSUNG: Add platform device for idma ARM: EXYNOS4: Add more registers to be saved and restored for PM ARM: EXYNOS4: Add more register addresses of CMU ARM: EXYNOS4: Add platform device for dwmci driver ARM: EXYNOS4: configure rtc-s3c on NURI ARM: EXYNOS4: configure MAX8903 secondary charger on NURI ARM: EXYNOS4: configure ADC on NURI ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs ... Fix up tons of silly conflicts: - arch/arm/mach-davinci/include/mach/psc.h - arch/arm/mach-exynos4/Kconfig - arch/arm/mach-exynos4/mach-smdkc210.c - arch/arm/mach-exynos4/pm.c - arch/arm/mach-imx/mm-imx1.c - arch/arm/mach-imx/mm-imx21.c - arch/arm/mach-imx/mm-imx25.c - arch/arm/mach-imx/mm-imx27.c - arch/arm/mach-imx/mm-imx31.c - arch/arm/mach-imx/mm-imx35.c - arch/arm/mach-mx5/mm.c - arch/arm/mach-s5pv210/mach-goni.c - arch/arm/mm/Kconfig		2011-07-26 17:41:04 -07:00
..
hardware	Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:41:04 -07:00
mach	ARM: add dma_zone_size to the machine_desc structure	2011-07-18 15:29:57 -04:00
a.out-core.h	ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump	2011-03-10 15:16:29 +00:00
a.out.h
asm-offsets.h
assembler.h	ARM: assembler.h: Add string declaration macro	2011-07-07 15:31:05 +01:00
atomic.h	atomic: cleanup asm-generic atomic*.h inclusion	2011-07-26 16:49:47 -07:00
auxvec.h
bitops.h	asm-generic: add another generic ext2 atomic bitops	2011-07-26 16:49:46 -07:00
bitsperlong.h
bug.h
bugs.h
byteorder.h
cache.h	ARM: implement support for read-mostly sections	2010-12-05 08:39:36 +00:00
cacheflush.h	Merge branch 'v6v7' into devel	2011-03-16 23:35:26 +00:00
cachetype.h	ARM: 6385/1: setup: detect aliasing I-cache when D-cache is non-aliasing	2010-10-04 20:57:09 +01:00
checksum.h
clkdev.h	ARM: Consolidate the clkdev header files	2011-07-19 18:09:45 +02:00
cpu.h
cputime.h
cputype.h	ARM: 6881/1: cputype.h uses __attribute_const__ which requires including kernel.h	2011-04-16 21:42:59 +01:00
current.h
delay.h
device.h
div64.h
dma-mapping.h	ARM: dma: replace ISA_DMA_THRESHOLD with a variable	2011-07-12 11:08:12 +01:00
dma.h	ARM: ARM_DMA_ZONE_SIZE is no more	2011-07-18 15:30:57 -04:00
domain.h	ARM: 6384/1: Remove the domain switching on ARMv6k/v7 CPUs	2010-11-04 15:44:31 +00:00
ecard.h
elf.h	ARM: 6883/1: ptrace: Migrate to regsets framework	2011-05-14 21:36:55 +01:00
emergency-restart.h
entry-macro-multi.S	ARM: entry: re-allocate registers in irq entry assembly macros	2011-07-02 10:56:10 +01:00
entry-macro-vic2.S
errno.h
fb.h
fcntl.h
fiq.h	ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume	2011-05-26 10:31:06 +01:00
fixmap.h
flat.h
floppy.h
fncpy.h	ARM: 6640/1: Thumb-2: Symbol manipulation macros for function body copying	2011-01-27 11:48:58 +00:00
fpstate.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
ftrace.h	ARM: 6319/1: ftrace: add Thumb-2 support to dynamic ftrace	2010-09-02 15:28:43 +01:00
futex.h	ARM: 6889/1: futex: add SMP futex support when !CPU_USE_DOMAINS	2011-05-12 10:11:44 +01:00
glue-cache.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
glue-df.h	ARM: move cache/processor/fault glue to separate include files	2011-02-12 11:52:21 +00:00
glue-pf.h	ARM: move cache/processor/fault glue to separate include files	2011-02-12 11:52:21 +00:00
glue-proc.h	Merge branch 'v6v7' into devel	2011-03-16 23:35:26 +00:00
glue.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
gpio.h
hardirq.h	ARM: SMP: collect IPI and local timer IRQs for /proc/stat	2010-12-20 15:08:01 +00:00
highmem.h	ARM: 6639/1: allow highmem on SMP platforms without h/w TLB ops broadcast	2011-02-23 17:24:17 +00:00
hw_breakpoint.h	ARM: hw_breakpoint: unify single-stepping code for watchpoints and breakpoints	2010-12-06 11:55:57 +00:00
hw_irq.h	arm: dove: Use proper irq accessor functions	2011-03-29 14:47:57 +02:00
hwcap.h	ARM: hwcaps: add new HWCAP defines for ARMv7-A	2011-07-07 19:20:51 +01:00
ide.h
io.h	ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+	2011-01-31 10:53:42 +00:00
ioctl.h
ioctls.h	ioctl: Use asm-generic/ioctls.h on arm (enables termiox)	2010-10-22 10:19:59 -07:00
ipcbuf.h
irq_regs.h
irq.h	ARM: introduce handle_IRQ() not to dump exception stack	2011-07-12 19:42:40 +08:00
irqflags.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
Kbuild	archs: replace unifdef-y with header-y	2010-08-14 22:26:51 +02:00
kdebug.h
kexec.h	[ARM] add machine-specific hook to machine_kexec	2011-03-03 16:26:55 -05:00
kgdb.h	kgdb,arm: fix register dump	2010-10-29 13:14:40 -05:00
kmap_types.h
kprobes.h	ARM: kprobes: Extend arch_specific_insn to add pointer to emulated instruction	2011-07-13 17:32:42 +00:00
leds.h
limits.h
linkage.h
local64.h
local.h
localtimer.h	ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime	2011-02-23 17:54:27 +00:00
locks.h
mach-types.h
mc146818rtc.h
memblock.h	ARM: fix memblock breakage	2010-10-27 21:41:39 +01:00
memory.h	ARM: dma: replace ISA_DMA_THRESHOLD with a variable	2011-07-12 11:08:12 +01:00
mman.h
mmu_context.h	ARM: add a vma entry for the user accessible vector page	2010-10-01 22:35:19 -04:00
mmu.h	ARM: 6490/1: MM: bugfix: initialize spinlock for init_mm.context	2010-11-23 22:46:12 +00:00
module.h	ARM: 6766/1: Thumb-2: Reflect ARM/Thumb-2 configuration in module vermagic	2011-02-26 13:36:06 +00:00
msgbuf.h
mtd-xip.h
mutex.h
nwflash.h
outercache.h	Merge branches 'fixes', 'pgt-next' and 'versatile' into devel	2011-03-20 09:32:12 +00:00
page-nommu.h
page.h	ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM	2011-05-26 10:23:24 +01:00
param.h
parport.h
pci.h	ARM: convert PCI defines to variables	2011-07-12 11:19:29 -05:00
percpu.h
perf_event.h	ARM: perf: add support for the Cortex-A15 PMU	2011-07-07 19:20:53 +01:00
pgalloc.h	ARM: 6757/1: fix tlb.h induced linux/swap.h build failure	2011-02-23 16:19:21 +00:00
pgtable-hwdef.h
pgtable-nommu.h
pgtable.h	ARM: pgtable: add pud-level code	2011-02-21 19:24:14 +00:00
pmu.h	ARM: 6974/1: pmu: refactor reservation	2011-06-29 10:27:08 +01:00
poll.h
posix_types.h
proc-fns.h	ARM: 6988/1: multi-cpu: remove arguments from CPU proc macros	2011-07-06 20:49:45 +01:00
processor.h	Merge branch 'misc' into devel	2011-03-16 23:35:25 +00:00
procinfo.h
prom.h	arm/dt: probe for platforms via the device tree	2011-05-23 09:30:20 -06:00
ptrace.h	ARM: ptrace: Add APSR_MASK definition to ptrace.h	2011-07-13 17:32:43 +00:00
resource.h
scatterlist.h	ARM: Allow SoCs to enable scatterlist chaining	2011-06-02 11:16:22 +01:00
sched_clock.h	ARM: sched_clock: allow init_sched_clock() to be called early	2011-01-11 16:23:04 +00:00
seccomp.h	ARM: SECCOMP support	2010-10-01 22:32:18 -04:00
sections.h
segment.h
sembuf.h
serial.h
setup.h	Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next	2011-07-22 23:08:48 +01:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
sizes.h	ARM: 6871/1: Use asm-generic/sizes.h	2011-04-16 12:52:18 +01:00
smp_plat.h	Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux' and 'unwind' into devel	2010-10-18 22:34:25 +01:00
smp_scu.h	ARM: pm: add function to set WFI low-power mode for SMP CPUs	2011-02-11 12:29:18 +00:00
smp_twd.h	ARM: localtimer: clean up local timer on hot unplug	2010-12-20 15:09:16 +00:00
smp.h	ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7	2011-05-26 12:14:32 +01:00
socket.h
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h	ARM: 6939/1: fix missing 'cpu_relax()' declaration	2011-05-23 17:19:26 +01:00
stackprotector.h
stacktrace.h
stat.h
statfs.h
string.h
suspend.h	ARM: pm: allow suspend finisher to return error codes	2011-07-02 09:54:01 +01:00
swab.h
system.h	ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code	2011-06-24 09:54:39 +01:00
tcm.h	ARM: 6985/1: export functions to determine the presence of I/DTCM	2011-07-06 20:49:45 +01:00
termbits.h	tty: Add EXTPROC support for LINEMODE	2010-08-10 13:47:39 -07:00
termios.h
therm.h
thread_info.h	ARM: SECCOMP support	2010-10-01 22:32:18 -04:00
thread_notify.h	ARM: 6867/1: Introduce THREAD_NOTIFY_COPY for copy_thread() hooks	2011-04-10 21:13:36 +01:00
timex.h
tlb.h	arm: mmu_gather rework	2011-05-25 08:39:14 -07:00
tlbflush.h	ARM: btc: avoid invalidating the branch target cache on kernel TLB maintanence	2011-07-19 11:44:06 +01:00
tls.h	ARM: v6k: select TLS register code according to V6 variants	2011-02-02 21:23:29 +00:00
topology.h
traps.h	ARM: 7004/1: fix traps.h compile warnings	2011-07-22 17:19:02 +01:00
types.h	remove dma64_addr_t	2011-03-23 19:47:18 -07:00
uaccess.h	ARM: 6384/1: Remove the domain switching on ARMv6k/v7 CPUs	2010-11-04 15:44:31 +00:00
ucontext.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
unaligned.h
unified.h
unistd.h	Merge branch 'setns'	2011-05-28 10:51:01 -07:00
unwind.h
user.h	ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump	2011-03-10 15:16:29 +00:00
vfp.h
vfpmacros.h	ARM: 6203/1: Make VFPv3 usable on ARMv6	2010-07-09 14:41:34 +01:00
vga.h	ARM: set vga memory base at run-time	2011-07-12 11:19:29 -05:00
xor.h