]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9d2143fb3839e04794c3e235b0f3097b697dc6da
tree7dd6f8742afc875fed95259355c439f7732edcfa
parentcfb19b1907c58359c162a764dd4c493e3982d612
parent95e750bddb571fb043d09a96bae070d048cdff74
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 <arnd@arndb.de>