summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/ac.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-10 11:30:56 +0000
committerMark Brown <broonie@linaro.org>2014-03-10 11:30:56 +0000
commit7f35afd44b14a39307757629ebc0a199aade52d9 (patch)
treef9781755805678bcb3e102723d9d00c5ad319b56 /drivers/acpi/ac.c
parentb25b1b6d72e15f0f19469e56fdb3576128cae22a (diff)
parent8eeb5c15131d7b5061c10423eda3ae4c68db4eaf (diff)
parentea2787f350ea5f649fda6bb708c4182cf4ec06ca (diff)
parent58d4d3c976b33784a1443c446a3d7203bf2153f0 (diff)
Merge remote-tracking branches 'asoc/fix/88pm860', 'asoc/fix/omap' and 'asoc/fix/si476x' into asoc-linus