aboutsummaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown2014-11-21 11:32:36 +0000
committerMark Brown2014-11-21 11:32:36 +0000
commita63b87838a592577c7134a3cb89c74e59b9dd9c1 (patch)
tree5f27a0c127faabba6d42f1f975dafa1c00f013de /drivers/base
parentc6efe576183a86d0ce637f259b5ea3a7653f8f76 (diff)
parent22853223d15b3a626de62cf9e40ce2d3881bc0a8 (diff)
parente39be3a31b8f16d92fff096e92b593a9bffecb93 (diff)
Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/headers' into regmap-next