update local version

This is needed so the AR6000 driver can be loaded
Merge remote-tracking branch 'upstream/jellybean' into jellybean