From: tmk <nobody@nowhere>
Date: Mon, 22 Sep 2014 01:52:27 +0000 (+0900)
Subject: Merge branch 'scottjad-master' into usb_usb_fix
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=e3f4f7d8c4dd821ff47caa8a22318c674f43a4e9;p=max%2Ftmk_keyboard.git

Merge branch 'scottjad-master' into usb_usb_fix
---

e3f4f7d8c4dd821ff47caa8a22318c674f43a4e9