From: Jacob Keller <jacob.e.keller@intel.com>
Date: Thu, 13 Nov 2014 18:27:23 +0000 (-0800)
Subject: aiaiai: merge development work
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6b916dbae65a2ea9ffb7f1519fadf600d441472c;p=users%2Fdedekind%2Faiaiai.git

aiaiai: merge development work

The development branch has been stable in my test environment for a
while now. I think now is a good time to get these changes back into
master.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
---

6b916dbae65a2ea9ffb7f1519fadf600d441472c