Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Thu, 8 Dec 2011 15:52:23 +0000 (15:52 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 8 Dec 2011 15:52:23 +0000 (15:52 +0000)
commit073c460311662eff7beb429de21acdbf7d90a4cb
treed5cd52a6112739d55c2928c7b435fecf8eab0b75
parentb981f980b068617e021736eb19092919fc7d0e53
parentc564a0cb9d0c7f4ac50f1e9ca8bc67fd66cd550f
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes