projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9abf29e 759af17)
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into late/board
authorArnd Bergmann <arnd@arndb.de>
Wed, 25 Jul 2012 19:41:33 +0000 (21:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 25 Jul 2012 19:41:33 +0000 (21:41 +0200)
From Haojian Zhuang <haojian.zhuang@gmail.com>:

* 'board-specific' of git://github.com/hzhuang1/linux:
  ARM: pxa: hx4700: Use DEFINE_RES_* macros consistently
  ARM: pxa: remove eseries.h

It seems I missed this in the original pull requests for v3.6, adding
it now.

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

Trivial merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules