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)
* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: mmp: fix potential NULL dereference


Trivial merge