]> Pileus Git - ~andy/linux/commitdiff
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)

Trivial merge