summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-03-02 17:11:18 -0800
committerTony Lindgren <tony@atomide.com>2011-03-02 17:11:18 -0800
commitb2833a0578453449dce1b8b8e54f67a544c5e37f (patch)
tree0aba11913a8deb4bdaaa08fdd9c7c1b151c8c099
parent12d7d4e0ed8fecf7f74c89483b55b300be6e5901 (diff)
parentd594f1f31afe13edd8c02f3854a65cc58cfb3b74 (diff)
parentb176654e7796b2812632e7c4a1a4b6efbfae5f1b (diff)
parent0a0d128d023a49eb8afa0e988e6773416318a0b5 (diff)
parent0005ae73cfe44ee42d0be12a12cc82bf982f518e (diff)
Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus
Conflicts: arch/arm/mach-omap2/omap_hwmod_44xx_data.c