diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-03 02:11:18 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-03 02:11:18 +0100 |
| commit | b2833a0578453449dce1b8b8e54f67a544c5e37f (patch) | |
| tree | 0aba11913a8deb4bdaaa08fdd9c7c1b151c8c099 /arch | |
| parent | Merge branch 'devel-cleanup' into omap-for-linus (diff) | |
| parent | omap: IOMMU: add support to callback during fault handling (diff) | |
| parent | OMAP: hwmod: Removal of macros for data that is obtained from hwmod database (diff) | |
| parent | mfd: twl4030_codec: Remove unused and duplicate audio_mclk fields (diff) | |
| parent | OMAP: hsmmc: Rename the device and driver (diff) | |
| download | linux-b2833a0578453449dce1b8b8e54f67a544c5e37f.tar.xz linux-b2833a0578453449dce1b8b8e54f67a544c5e37f.zip | |
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