I don't think this is maintainable with this method
Merge branch 'downstream' of https://github.com/Lightsword1942/asuswrt-merlin into downstream

Conflicts:
	release/src-rt-6.x.4708/linux/linux-2.6.36/arch/arm/mach-brcm-hnd/board_ns.c