merge with master 2.1b_release submit/tizen_2.1/20130424.235511
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:25:05 +0000 (01:25 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:25:05 +0000 (01:25 +0900)
commitef569b808c4a0b21097842235015299826f80b4e
treeaac1402f1c716abeecf81c6d24e8b03bc4e95d3e
parent30500ea784d9bdbe265cc1ca656903de2e5f6192
merge with master
24 files changed:
Makefile
arch/arm/cpu/armv7/exynos/soc.c
arch/arm/include/asm/arch-exynos/cpu.h
arch/arm/include/asm/arch-exynos/dw_mmc.h [new file with mode: 0644]
board/samsung/common/Makefile [deleted file]
board/samsung/trats/Makefile
board/samsung/trats/common.c [moved from board/samsung/common/common.c with 100% similarity]
board/samsung/trats/inform.c [moved from board/samsung/common/inform.c with 100% similarity]
board/samsung/trats/trats.c
board/samsung/trats2/Makefile [deleted file]
board/samsung/trats2/lowlevel_init.S [deleted file]
board/samsung/trats2/trats2.c [deleted file]
boards.cfg
common/cmd_usbd.c
drivers/misc/max77686.c
drivers/misc/max77693.c
drivers/misc/max77693_fg.c
drivers/mmc/Makefile
drivers/mmc/s5p_dw_mmc.c [new file with mode: 0644]
drivers/mobile/Tizen_GPT_Ver10.h [deleted file]
include/configs/exynos_trats2.h [deleted file]
include/fuelgauge_battery_data.h
include/max77686.h
include/max77693.h