diff options
author | 2013-06-18 20:11:32 +0100 | |
---|---|---|
committer | 2013-06-18 20:11:32 +0100 | |
commit | 3fbd55ec21e698221ffb43526090137b07c32586 (patch) | |
tree | 421349dff22226b6b85188a5bf8b0bc6e167dfeb /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'for-rmk/hugepages' of git://git.linaro.org/people/stevecapper/linux into devel-stable (diff) | |
parent | ARM: elf: add new hwcap for identifying atomic ldrd/strd instructions (diff) | |
download | linux-dev-3fbd55ec21e698221ffb43526090137b07c32586.tar.xz linux-dev-3fbd55ec21e698221ffb43526090137b07c32586.zip |
Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Conflicts:
arch/arm/kernel/smp.c
Please pull these miscellaneous LPAE fixes I've been collecting for a while
now for 3.11. They've been tested and reviewed by quite a few people, and most
of the patches are pretty trivial. -- Will Deacon.
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions