Merge branch 'master' into buildroot201605

This commit is contained in:
Calin Crisan 2016-08-28 17:52:33 +03:00
commit 459d2821c6
2 changed files with 8 additions and 0 deletions

View File

@ -1,4 +1,8 @@
os_debug="false"
os_prereleases="false"
os_tty_login="ttyS0"
os_eth="eth0"
os_wlan="wlan0"
os_ppp="ppp0"
os_networkless="false"

View File

@ -1,4 +1,8 @@
os_debug="false"
os_prereleases="false"
os_tty_login="ttyS0"
os_eth="eth0"
os_wlan="wlan0"
os_ppp="ppp0"
os_networkless="false"