You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 0e51793e16 Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm ... Pull ARM updates from Russell King: "This is the first chunk of ARM updates for this merge window. Conflicts are expected in two files - asm/timex.h and mach-integrator/integrator_cp.c. Nothing particularly stands out more than anything else. Most of the growth is down to the opcodes stuff from Dave Martin, which is countered by Rob's patches to use more of the asm-generic headers on ARM." (A few more conflicts grew since then, but it all looked fairly trivial) * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (44 commits) ARM: 7548/1: include linux/sched.h in syscall.h ARM: 7541/1: Add ARM ERRATA 775420 workaround ARM: ensure vm_struct has its phys_addr member filled in ARM: 7540/1: kexec: Check segment memory addresses ARM: 7539/1: kexec: scan for dtb magic in segments ARM: 7538/1: delay: add registration mechanism for delay timer sources ARM: 7536/1: smp: Formalize an IPI for wakeup ARM: 7525/1: ptrace: use updated syscall number for syscall auditing ARM: 7524/1: support syscall tracing ARM: 7519/1: integrator: convert platform devices to Device Tree ARM: 7518/1: integrator: convert AMBA devices to device tree ARM: 7517/1: integrator: initial device tree support ARM: 7516/1: plat-versatile: add DT support to FPGA IRQ ARM: 7515/1: integrator: check PL010 base address from resource ARM: 7514/1: integrator: call common init function from machine ARM: 7522/1: arch_timers: register a time/cycle counter ARM: 7523/1: arch_timers: enable the use of the virtual timer ARM: 7531/1: mark kernelmode mem{cpy,set} non-experimental ARM: 7520/1: Build dtb files in all target ARM: Fix build warning in arch/arm/mm/alignment.c ...		13 years ago
..
include/plat	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
Kconfig	Merge branch 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds into next/drivers	13 years ago
Makefile	ARM: vexpress: convert to multi-platform	13 years ago
clcd.c	ARM: add versatile family consolidated CLCD support	14 years ago
clock.c	ARM: Indirect round/set_rate operations through clk structure	15 years ago
fpga-irq.c	ARM: 7516/1: plat-versatile: add DT support to FPGA IRQ	13 years ago
headsmp.S	ARM: versatile: Add missing ENDPROC to headsmp.S	13 years ago
leds.c	ARM: mach-realview and mach-versatile: retire custom LED code	13 years ago
platsmp.c	ARM: consolidate pen_release instead of having per platform definitions	13 years ago
sched-clock.c	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	13 years ago