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

This commit is contained in:
Russell King 2010-05-03 22:37:06 +01:00
commit 941f81c16e
29 changed files with 2378 additions and 6 deletions