Merge branch 'master' into radar

Conflicts:
	tools/.gitignore

diff --cc tools/.gitignore
index 8fec132bedc33dfda6f2a6e9e6919564951b2879,caffdb05281c87585cf0c0ca941307209b3e99c3..50aa8854316bd47447a7f4b60b5eea4bfa9d34fe
--- 1/tools/.gitignore
--- 2/tools/.gitignore
+++ b/tools/.gitignore
@@@ -1,7 -1,6 +1,6 @@@
  src/checksum
  src/fwinfo
 -src/fwprepare
  src/miniboot
- src/eeprom_fix
 +src/fwprepare
  src/wol
  carlu/carlu