Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable