From: Axel Neumann <neumann@cgws.de>
Date: Sun, 4 Aug 2013 06:25:07 +0000 (+0200)
Subject: Merge branch 'bmx6_testing' into bmx6_testing_new_config
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=0fda0b049c88398e6b47e45be95553d638e81e54;hp=-c;p=lede-routing%2F.git

Merge branch 'bmx6_testing' into bmx6_testing_new_config

Conflicts:
	bmx6/Makefile
---

0fda0b049c88398e6b47e45be95553d638e81e54