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

This commit is contained in:
Russell King 2009-04-17 21:35:44 +01:00 • committed by Russell King
commit c917c1d015
8 changed files with 30 additions and 7 deletions