Merge branch 'next-s3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

This commit is contained in:
Russell King 2009-09-18 20:55:56 +01:00
commit 07198871da
9 changed files with 34 additions and 8 deletions