diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 00:20:17 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 00:20:17 +0100 |
commit | 742eaa6a6e356a16788ce6530271de89bc4f8fb5 (patch) | |
tree | 12fc040daab06ac796c61c1d92bfad9bb054d1c1 /Documentation/kmemcheck.txt | |
parent | ARM: 7189/1: OMAP3: Fix build break in cpuidle34xx.c because of irq function (diff) | |
parent | Merge branches 'perf/event-nos', 'perf/updates' and 'perf/omap4' into for-rmk (diff) | |
download | linux-742eaa6a6e356a16788ce6530271de89bc4f8fb5.tar.xz linux-742eaa6a6e356a16788ce6530271de89bc4f8fb5.zip |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Conflicts:
arch/arm/common/gic.c
arch/arm/plat-omap/include/plat/common.h
Diffstat (limited to 'Documentation/kmemcheck.txt')
0 files changed, 0 insertions, 0 deletions