OSDN Git Service

Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 00:25:10 +0000 (10:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 00:25:10 +0000 (10:25 +1000)
commitaebc4c6310eb9375cc394528fe07ab8b0574d3f1
tree5310b6bf2c4a95b9907b7dcc76197a2595ce2f23
parent80a945cb88538811e4bab4ba4087bf602c009698
parent6ce87b2a60f16645c8e2ebf4bc5079958bb7e8a5
Merge remote-tracking branch 'thermal/next'
drivers/acpi/thermal.c
drivers/thermal/power_allocator.c