Merge pull request #1 in BOOT/bootimage-initfs from paul-minor_cleanup to master
authorKyle Sheumaker <ksheumaker@advancedclustering.com>
Thu, 22 Oct 2015 18:56:35 +0000 (13:56 -0500)
committerKyle Sheumaker <ksheumaker@advancedclustering.com>
Thu, 22 Oct 2015 18:56:35 +0000 (13:56 -0500)
commitbdef94d82175b1b380f08098069148d83eafcf0e
treeacca21cbe688ce4e6d613c66f687fb4c93006dcd
parent01e504c1320d60f4f416556142e4bcd4a9094cdb
parent64ca3b6c2ec7def6c73e0c18f981d0f316ec48b7
Merge pull request #1 in BOOT/bootimage-initfs from paul-minor_cleanup to master

* commit '64ca3b6c2ec7def6c73e0c18f981d0f316ec48b7':
  Changed back from 1 sec to 10 sec
  Corrected custom sleep at boot code; set to 1 sec