diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 20:59:09 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 20:59:09 +0100 |
| commit | b8bc83971cc20cae3c3b65c26a804f350d74960c (patch) | |
| tree | 2573e6367e1806c298344fa023bb49a16cc4d1e4 /arch/arm/plat-s5p/dev-tv.c | |
| parent | Merge branch 'samsung/devel' into next/devel2 (diff) | |
| parent | ARM: mmp: register internal sram bank (diff) | |
| download | linux-b8bc83971cc20cae3c3b65c26a804f350d74960c.tar.xz linux-b8bc83971cc20cae3c3b65c26a804f350d74960c.zip | |
Merge branch 'pxa/devel' into next/devel2
Conflicts:
arch/arm/mach-s3c2416/s3c2416.c
Diffstat (limited to 'arch/arm/plat-s5p/dev-tv.c')
0 files changed, 0 insertions, 0 deletions