tree 675a2b01617549b539a4dcb1aec7141798e1f324
parent 0bed4b7aa02c06e05121875dc443295d55b9d91d
parent e679660dbb8347f275fe5d83a5dd59c1fb6c8e63
author Russell King <rmk+kernel@arm.linux.org.uk> 1451992048 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1451992048 +0000

Merge branches 'misc' and 'misc-rc6' into for-linus