]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'depends/rmk-perf' into for-next
authorArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 15:54:02 +0000 (16:54 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 15:54:02 +0000 (16:54 +0100)
* depends/rmk-perf:
  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


Trivial merge