From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 4 Jul 2012 11:49:58 +0000 (+0200)
Subject: Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8df0fd939a9dab6b68ad06dbc6d51e6246091fa0;p=linux-edison.git

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>
---

8df0fd939a9dab6b68ad06dbc6d51e6246091fa0