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

This commit is contained in:
Russell King 2010-07-22 16:00:55 +01:00
commit cb86ae95a0
8 changed files with 596 additions and 56 deletions