Merge branch 'fixes' into next/fixes
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 20:18:39 +0000 (22:18 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 20:18:39 +0000 (22:18 +0200)
commit589a66da99b0c7d017216c465b770c9de5028783
treec013d34ca3c2060ed3b9d8523a0cc4bbf6eefbd3
parent32d80f97fe4a86b7e9de5d13030432de115119b1
parent519dc3cdfd06fbb67111542fd50d6533b7d1d693
Merge branch 'fixes' into next/fixes