tree 57e5f9a709eea8e60eaadb6613f7b3012b591a6a
parent 459413db33d6c99fc13d60f88899fb72d2530ed3
parent 99b725084450bbc6f8e1ab20a0df4cc291c342b5
parent 93f770846e8dedc5d9117bd4ad9d7efd18420627
parent 2d58d7ea9164da59d0ea82fdf80e3ababe52d58c
author Len Brown <len.brown@intel.com> 1327366026 -0500
committer Len Brown <len.brown@intel.com> 1327366026 -0500

Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release