Merge branch 'for-rmk-fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx