diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-19 01:22:53 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-22 10:52:24 +0100 |
| commit | f150abe1012f2fc7d444d33d651db32435038c11 (patch) | |
| tree | c42777a7237d97a32692ed41e174fbe92a32f69a /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge branch 'leds-fixes-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds (diff) | |
| parent | ARM: ARMv7-M: implement read_cpuid_ext (diff) | |
| download | linux-dev-f150abe1012f2fc7d444d33d651db32435038c11.tar.xz linux-dev-f150abe1012f2fc7d444d33d651db32435038c11.zip | |
Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable
Pull ARM-v7M support from Uwe Kleine-König:
"All but the last patch were in next since next-20130418 without issues.
The last patch fixes a problem in combination with
8164f7a (ARM: 7680/1: Detect support for SDIV/UDIV from ISAR0 register)
which triggers a WARN_ON without an implemented read_cpuid_ext.
The branch merges fine into v3.10-rc1 and I'd be happy if you pulled it
for 3.11-rc1. The only missing piece to be able to run a Cortex-M3 is
the irqchip driver that will go in via Thomas Gleixner and platform
specific stuff."
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions