From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 14 Aug 2012 13:20:46 +0000 (+0200)
Subject: [master] Merge branch 'rt25901_atf'
X-Git-Tag: v4_3_0a1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c8df6dd08d48a4bab5fdec6ea71c70e9bd9dc2;p=thirdparty%2Fdhcp.git

[master] Merge branch 'rt25901_atf'

Conflicts:
	configure
---

85c8df6dd08d48a4bab5fdec6ea71c70e9bd9dc2