summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-13 15:00:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-13 15:00:55 -0700
commit1b57c7c2fbb81763cd4a6940c8530c98022c409c (patch)
treef9d6af50dd1485ccdb4bcdafb3899564b6e4f36a /drivers/acpi
parent8d9095c667a185c8e2449632343a2b6c65ae58f1 (diff)
parentf58078dacaaf6fbe664d5404dca7f76dce576113 (diff)
Merge tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap update from Mark Brown: "Just one patch for regmap this time around, a change from Steven Rostedt to prettify the way we're making the regmap internal header available to the trace events (it turns out that the trace subsystem doesn't actually need to be in trace/events)" * tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: Move tracing header into drivers/base/regmap
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions