tree f84832df4429178ba9da41b2876d7ae4840f62ea
parent 3faf12cd8603e3efbcc7e570e07dfd1ea2a17095
parent aab3a70e98a1492833c713fe095dbdccb3bc6262
author Linus Torvalds <torvalds@linux-foundation.org> 1318214907 +1200
committer Linus Torvalds <torvalds@linux-foundation.org> 1318214907 +1200

Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc

* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
  ARM: mach-ux500: enable fix for ARM errata 754322
  ARM: OMAP: musb: Remove a redundant omap4430_phy_init call in usb_musb_init
  ARM: OMAP: Fix i2c init for twl4030
  ARM: OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1