diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-12-14 11:33:19 -0600 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-12-14 11:33:19 -0600 |
| commit | f2d84a9b89eb927d3b0b868a2ca83941273f28f0 (patch) | |
| tree | 42067d2c8eaec9b826d9e9f02892c0321ffa36f0 /Documentation/mips | |
| parent | f9ac7a7be4e193c56cfd6f9653bd34e00cb98aa4 (diff) | |
| parent | 070b34dd5d0a75ff1f1dc538f91990df1b63269a (diff) | |
| download | kernel_samsung_espresso10-f2d84a9b89eb927d3b0b868a2ca83941273f28f0.zip kernel_samsung_espresso10-f2d84a9b89eb927d3b0b868a2ca83941273f28f0.tar.gz kernel_samsung_espresso10-f2d84a9b89eb927d3b0b868a2ca83941273f28f0.tar.bz2 | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
Conflicts:
arch/arm/mach-omap2/pm44xx.c
arch/arm/mach-omap2/smartreflex-class1p5.c
arch/arm/mach-omap2/smartreflex.h
arch/arm/mach-omap2/voltage.h
drivers/remoteproc/remoteproc.c
drivers/rpmsg/rpmsg_resmgr.c
include/video/dsscomp.h
Change-Id: I516310bbf02d4e6fc0d980e1755b2b35dfbc7ed4
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'Documentation/mips')
0 files changed, 0 insertions, 0 deletions