| commit | 8df0fd939a9dab6b68ad06dbc6d51e6246091fa0 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Jul 04 13:49:58 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Jul 04 13:49:58 2012 +0200 |
| tree | b607395ee7e759d5ed75766c12bb6a0b90d2257a | |
| parent | 811dde659f0de35bacf272ee8879362115d1727d [diff] | |
| parent | c12a3cb9dca96768a5f048bb50f3395216346bda [diff] |
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>