From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 2 Dec 2014 23:05:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'mfischer/daq' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a01c170110374afcc6b7cfe26e63623e4f3aabb;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'mfischer/daq' into next
---

1a01c170110374afcc6b7cfe26e63623e4f3aabb