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

This commit is contained in:
Russell King 2009-08-03 17:58:02 +01:00 • committed by Russell King
commit 38a6fe8c01
7 changed files with 28 additions and 24 deletions