From: tmk <nobody@nowhere>
Date: Mon, 24 Nov 2014 06:36:53 +0000 (+0900)
Subject: Merge branch 'merge_rn42'
X-Git-Url: https://git.donarmstrong.com/?p=tmk_firmware.git;a=commitdiff_plain;h=ed52ebb9870a26496b13a0565c1aaca8ded3465b;hp=e2077cad45f1736e878e317c43bd94117c61b5e0

Merge branch 'merge_rn42'
---