diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-01-20 10:57:01 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-01-20 10:57:01 +0200 |
| commit | cb1fbad7ec250ac408a4682d38b205958a17a02b (patch) | |
| tree | e19ac5e90ada26b71646234131e39c86ec437bff /drivers/input/misc/atlas_btns.c | |
| parent | 073bf172619612bd4bfaa0f59e694b5d1b2f4c49 (diff) | |
| parent | e4998634dd3874e24bbf7937305c5ac708243908 (diff) | |
| parent | fc1fe6e794cc85fcdb63daa9c7a977940ff49e4f (diff) | |
| download | blackbird-op-linux-cb1fbad7ec250ac408a4682d38b205958a17a02b.tar.gz blackbird-op-linux-cb1fbad7ec250ac408a4682d38b205958a17a02b.zip | |
Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next
Merge fbdev topic branches
