Shaun Mulligan 7431b8cd2d fix merge conflicts		2017-12-10 13:45:11 +01:00
..
linux	fix merge conflicts	2017-12-10 13:45:11 +01:00
linux-firmware	fix up linux-firmware install and add usb1 and usb2 to armbianEnv.txt	2017-11-23 21:54:55 +01:00