git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 811dde6 c12a3cb)
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)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.