[PULL] button mapping fix and unconstify patches

[Peter Hutterer]

On Tue, Feb 04, 2014 at 01:31:16PM -0800, Alan Coopersmith wrote:
> On 02/ 4/14 01:33 PM, Peter Hutterer wrote:
> >       include: make the various button array lengths more obious
> 
> obvious?

oops, thanks. amended. Keith, new top commit is
25d10464f440b8b34594b7c988a99a830ea39a29, no other changes than the commit
message edit.

Cheers,
   Peter