diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-11 09:02:45 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-11 09:02:45 -0800 |
commit | 1e044f0490c9d9f26ebcdd3dc63e02790b798821 (patch) | |
tree | b3a2ee1ea5151c8972b7bb6a25c17816add2140a /arch/um/drivers | |
parent | 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff) | |
parent | 9dcbf466559f6f2f55d60eb5a1bbebc8e694b52a (diff) | |
download | talos-op-linux-1e044f0490c9d9f26ebcdd3dc63e02790b798821.tar.gz talos-op-linux-1e044f0490c9d9f26ebcdd3dc63e02790b798821.zip |
Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/virt
* 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
ARM: perf: simplify __hw_perf_event_init err handling
ARM: perf: remove unnecessary checks for idx < 0
ARM: perf: handle armpmu_register failing
ARM: perf: don't pretend to support counting of L1I writes
ARM: perf: remove redundant NULL check on cpu_pmu
ARM: Use implementor and part defines from cputype.h
ARM: Define CPU part numbers and implementors
Diffstat (limited to 'arch/um/drivers')
0 files changed, 0 insertions, 0 deletions