dcf7ec5ee6
Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
|---|---|---|
| .. | ||
| include/mach | ||
| aspenite.c | ||
| avengers_lite.c | ||
| brownstone.c | ||
| clock.c | ||
| clock.h | ||
| common.c | ||
| common.h | ||
| devices.c | ||
| flint.c | ||
| gplugd.c | ||
| irq-mmp2.c | ||
| irq-pxa168.c | ||
| jasper.c | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| mmp2.c | ||
| pxa168.c | ||
| pxa910.c | ||
| sram.c | ||
| tavorevb.c | ||
| teton_bga.c | ||
| time.c | ||
| ttc_dkb.c | ||