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

This commit is contained in:
Russell King 2009-03-06 21:53:05 +00:00 • committed by Russell King
commit 74fac66e82
7 changed files with 33 additions and 18 deletions