Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Wed, 4 Jul 2012 11:49:58 +0000 (13:49 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 4 Jul 2012 11:49:58 +0000 (13:49 +0200)
commit8df0fd939a9dab6b68ad06dbc6d51e6246091fa0
treeb607395ee7e759d5ed75766c12bb6a0b90d2257a
parent811dde659f0de35bacf272ee8879362115d1727d
parentc12a3cb9dca96768a5f048bb50f3395216346bda
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

From Haojian Zhuang <haojian.zhuang@gmail.com>:

* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: mmp: remove mach/gpio-pxa.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>