diff options
| author | Len Brown <len.brown@intel.com> | 2012-10-09 01:47:35 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-10-09 01:47:35 -0400 |
| commit | d1d4a81b842db21b144ffd2334ca5eee3eb740f3 (patch) | |
| tree | fe4fde80d9190292f13d2d48c04ce3ea4fd4f764 /arch/avr32/include/asm/ioctls.h | |
| parent | 4084a9b99ccd05bf5e13dcd248e3b56a682fa4d6 (diff) | |
| parent | 67bfa9b60bd689601554526d144b21d529f78a09 (diff) | |
| parent | 29b19e250434c6193c8b8e4c34c9c6284dd4f101 (diff) | |
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release