diff options
| author | Len Brown <len.brown@intel.com> | 2012-01-23 19:47:06 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-01-23 19:47:06 -0500 |
| commit | eb7004e623637a6c2b32317c000d4b617b5cb053 (patch) | |
| tree | 57e5f9a709eea8e60eaadb6613f7b3012b591a6a /include | |
| parent | 459413db33d6c99fc13d60f88899fb72d2530ed3 (diff) | |
| parent | 99b725084450bbc6f8e1ab20a0df4cc291c342b5 (diff) | |
| parent | 93f770846e8dedc5d9117bd4ad9d7efd18420627 (diff) | |
| parent | 2d58d7ea9164da59d0ea82fdf80e3ababe52d58c (diff) | |
Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release