Merge branch 's3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux.git

This commit is contained in:
Russell King 2008-08-26 23:16:39 +01:00 committed by Russell King
commit 9abc6461a3
6 changed files with 20 additions and 18 deletions