| commit | 0f9cb211ba5db93d488fe6b154138231fdd0e22d | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Nov 25 21:34:34 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Sun Nov 25 21:34:34 2012 -0800 |
| tree | 293871b042e9ebc49b1d783f1b110eef541ddc97 | |
| parent | 007108a2279123ad6639b6c653ad1a731febb60f [diff] | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 [diff] |
Merge tag 'v3.7-rc7' into next/cleanup Merging in mainline back to next/cleanup since it has collected a few conflicts between fixes going upstream and some of the cleanup patches. Git doesn't auto-resolve some of them, and they're mostly noise so let's take care of it locally. Conflicts are in: arch/arm/mach-omap2/omap_hwmod_44xx_data.c arch/arm/plat-omap/i2c.c drivers/video/omap2/dss/dss.c Signed-off-by: Olof Johansson <olof@lixom.net>