]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:02:52 +0000 (13:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:02:52 +0000 (13:02 +1100)
commit93989e9cf1b619fc5a58846a2bfc8034428839fc
treebd7a6aea5628053418d4a6aad8a70d42816b0a13
parent083ee11b034aab59d0ce5aebfc6d22e401d5b81a
parent9d185d0417e518fd9cfce90ec2ad75f70771bbaa
Merge remote-tracking branch 'thermal/next'

Conflicts:
drivers/thermal/exynos_thermal.c
drivers/thermal/exynos_thermal.c