From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Mar 2015 16:54:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'mfischer/nasm' into next
X-Git-Tag: v2.17-core91~154^2~3^2~7
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=b339fb7f142ac96d440b0951728d194f0c2a5fc2

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

b339fb7f142ac96d440b0951728d194f0c2a5fc2