diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-08-04 16:45:04 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-04 16:45:04 -0700 |
| commit | 8a8d0b78174dc18ec9f4d1743117d933e61e3790 (patch) | |
| tree | 6078823cb7bbe7327b4e212d986ae578f25b1f00 /arch/arm/mach-clps711x | |
| parent | 9d0452856e4f0bf57d3020a632ad5bad819b8071 (diff) | |
| parent | c51693927bd88684cc50c1b278bf724aa96139a8 (diff) | |
| download | kernel_samsung_tuna-8a8d0b78174dc18ec9f4d1743117d933e61e3790.zip kernel_samsung_tuna-8a8d0b78174dc18ec9f4d1743117d933e61e3790.tar.gz kernel_samsung_tuna-8a8d0b78174dc18ec9f4d1743117d933e61e3790.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
sound/soc/omap/abe/abe_port.c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'arch/arm/mach-clps711x')
0 files changed, 0 insertions, 0 deletions