Merge branch 'topic/atmel' into for-linus