summaryrefslogtreecommitdiff
path: root/drivers/lguest
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-01 18:06:48 +0200
committerMark Brown <broonie@kernel.org>2016-07-01 18:06:48 +0200
commita29a36f2650dbaa54c8aed8cc9af909113c19ad3 (patch)
treeab09078df76ff26ba53d6813348a8fdc17c02c70 /drivers/lguest
parent4c2e07c6a29e0129e975727b9f57eede813eea85 (diff)
parent8a092e682f20f193f2070dba2ea1904e95814126 (diff)
parent91ff811f32763ea3135e832f7c1aeafc85ae1c98 (diff)
Merge remote-tracking branches 'regulator/fix/anatop' and 'regulator/fix/max77620' into regulator-linus