aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-10-09 01:47:35 -0400
committerLen Brown <len.brown@intel.com>2012-10-09 01:47:35 -0400
commitd1d4a81b842db21b144ffd2334ca5eee3eb740f3 (patch)
treefe4fde80d9190292f13d2d48c04ce3ea4fd4f764
parent4084a9b99ccd05bf5e13dcd248e3b56a682fa4d6 (diff)
parent67bfa9b60bd689601554526d144b21d529f78a09 (diff)
parent29b19e250434c6193c8b8e4c34c9c6284dd4f101 (diff)
downloadlinux-linaro-stable-d1d4a81b842db21b144ffd2334ca5eee3eb740f3.tar.gz
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release