Merge branch 'for-next' of git://github.com/rydberg/linux into next