From: Arnd Bergmann Date: Thu, 25 Oct 2012 13:49:01 +0000 (+0200) Subject: Merge branch 'for-rcs-3.7' of git://git.linaro.org/people/ljones/linux-3.0-ux500... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bc20debaa99163ec9af91fefdd356978d687fdf8;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge branch 'for-rcs-3.7' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into fixes * 'for-rcs-3.7' of git://git.linaro.org/people/ljones/linux-3.0-ux500: ARM: ux500: Correct SDI5 address and add some format changes ARM: ux500: Specify AMBA Primecell IDs for Nomadik I2C in DT ARM: ux500: Fix build error relating to IRQCHIP_SKIP_SET_WAKE Signed-off-by: Arnd Bergmann --- bc20debaa99163ec9af91fefdd356978d687fdf8