Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink...
authorLen Brown <len.brown@intel.com>
Tue, 24 Jan 2012 00:47:06 +0000 (19:47 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 24 Jan 2012 00:47:06 +0000 (19:47 -0500)
commiteb7004e623637a6c2b32317c000d4b617b5cb053
tree57e5f9a709eea8e60eaadb6613f7b3012b591a6a
parent459413db33d6c99fc13d60f88899fb72d2530ed3
parent99b725084450bbc6f8e1ab20a0df4cc291c342b5
parent93f770846e8dedc5d9117bd4ad9d7efd18420627
parent2d58d7ea9164da59d0ea82fdf80e3ababe52d58c
Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release