From: tmk <nobody@nowhere>
Date: Mon, 24 Nov 2014 07:19:00 +0000 (+0900)
Subject: Merge branch 'u2_fix'
X-Git-Url: https://git.donarmstrong.com/?p=tmk_firmware.git;a=commitdiff_plain;h=cc5693e0f13b02a281de04d5e39a4ffbecabf1ac;hp=-c

Merge branch 'u2_fix'
---

cc5693e0f13b02a281de04d5e39a4ffbecabf1ac