From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 25 Jul 2012 19:41:33 +0000 (+0200)
Subject: Merge branch 'board-specific' of git://github.com/hzhuang1/linux into late/board
X-Git-Tag: v3.12-rc1~2645^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43cb4a02d27ad9525ad23984d4fd06972810439f;p=kernel%2Fkernel-generic.git

Merge branch 'board-specific' of git://github.com/hzhuang1/linux into late/board

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

43cb4a02d27ad9525ad23984d4fd06972810439f