]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:09:58 +0000 (11:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:09:58 +0000 (11:09 +1000)
1  2 
drivers/acpi/thermal.c

Simple merge