Update ChangeLog
token.l should use nuttx/config.h not config.h
Merge remote-tracking branch 'upstream/master'
keypad works