From: Arnd Bergmann 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: firefly_0821_release~3680^2~2319^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=43cb4a02d27ad9525ad23984d4fd06972810439f;p=firefly-linux-kernel-4.4.55.git Merge branch 'board-specific' of git://github.com/hzhuang1/linux into late/board From Haojian Zhuang : * '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 --- 43cb4a02d27ad9525ad23984d4fd06972810439f