diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-08-04 16:43:41 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-04 16:43:41 -0700 |
| commit | c51693927bd88684cc50c1b278bf724aa96139a8 (patch) | |
| tree | 5cbff7e4c715b2fe94a386fe45e024bd874e12fd /sound/soc/omap/sdp3430.c | |
| parent | 352308dcc4134a672f3e96dd6ce9dda24cb204e1 (diff) | |
| parent | a1c650586322a141e3536d612cee61ded25456da (diff) | |
| download | kernel_samsung_tuna-c51693927bd88684cc50c1b278bf724aa96139a8.zip kernel_samsung_tuna-c51693927bd88684cc50c1b278bf724aa96139a8.tar.gz kernel_samsung_tuna-c51693927bd88684cc50c1b278bf724aa96139a8.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'sound/soc/omap/sdp3430.c')
0 files changed, 0 insertions, 0 deletions