Merge branch 'n900-keys' into omap-for-v4.6/dt

This commit is contained in:
Tony Lindgren 2016-02-22 11:02:18 -08:00
commit 8d08394f41