]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'for-rcs-3.7' of git://git.linaro.org/people/ljones/linux-3.0-ux500...
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Oct 2012 13:49:01 +0000 (15:49 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Oct 2012 13:49:01 +0000 (15:49 +0200)
* '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 <arnd@arndb.de>

Trivial merge