From: Len Brown <len.brown@intel.com>
Date: Tue, 24 Jan 2012 00:47:06 +0000 (-0500)
Subject: Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink... 
X-Git-Tag: firefly_0821_release~3680^2~3638^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eb7004e623637a6c2b32317c000d4b617b5cb053;p=firefly-linux-kernel-4.4.55.git

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

eb7004e623637a6c2b32317c000d4b617b5cb053