Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Thu, 16 Aug 2012 08:10:15 +0000 (10:10 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 16 Aug 2012 08:10:15 +0000 (10:10 +0200)
commit8a211d362cc94df2bb42323ab13d258650529bec
treeb7d4e58daa21698aae519c3352bd0e2c42a9c125
parent0a224c514f3e9620e167f9f6497ae526a41df22c
parentc0db19dabf138741e078f6391fb132821c0d98b5
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: mmp: fix potential NULL dereference