summaryrefslogtreecommitdiffstats
path: root/firmware/yamaha
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-04-23 14:12:10 +0200
committerIngo Molnar <mingo@kernel.org>2016-04-23 14:12:10 +0200
commit65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee (patch)
tree02b22c99008630010f28f45f502f55915f1014c2 /firmware/yamaha
parent9243ae5b28d02dc7d71a4f00c981ef6feaede3f1 (diff)
parentb303e7c15d53cd8ef6b349b702e07eee3f102792 (diff)
downloadlinux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.tar.bz2
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'firmware/yamaha')
0 files changed, 0 insertions, 0 deletions