summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2014-01-02 14:22:28 +0800
committerZhang Rui <rui.zhang@intel.com>2014-01-02 14:22:28 +0800
commit201531c2777e05c8f859c10fa35542da02e5870b (patch)
tree718febbf71832976e1b4495a953fb1ad880151a6
parenta116776f7b6052599df0c67db29c30ea9d69d7ee (diff)
parentbeeb5a1e0ef774d0a3e18c5a0e78c39e3e1a5389 (diff)
parentc1b7bac58fb0d251f86efe7daec1a2851b7792bf (diff)
parent925c36bb09bdf3858c10d5a591be737dd133d979 (diff)
downloadlinux-201531c2777e05c8f859c10fa35542da02e5870b.tar.gz
linux-201531c2777e05c8f859c10fa35542da02e5870b.tar.bz2
linux-201531c2777e05c8f859c10fa35542da02e5870b.zip
Merge branches 'misc', 'soc', 'soc-eduardo' and 'int3404-thermal' of .git into next