]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:54:43 +0000 (12:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:54:43 +0000 (12:54 +1000)
1  2 
drivers/acpi/thermal.c

Simple merge