diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-01-09 15:55:49 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-01-09 15:55:49 +0200 |
| commit | 132303e5aca87dcba8af7ec9760228238fc838c4 (patch) | |
| tree | b5722a673abe7b0b61e504040a1f81f078388dbd /include | |
| parent | 3c7e79af77f5992ae0e6f8a6f970322ba038aa23 (diff) | |
| parent | 25f957bb64d1c3f557f67589c778dd9eabe54573 (diff) | |
| parent | fc1fe6e794cc85fcdb63daa9c7a977940ff49e4f (diff) | |
Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next