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