Merge branch 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6