From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 6 Oct 2012 17:05:27 +0000 (+0200)
Subject: Merge branch 'master' into radar
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=781923f7697bd4c8bdd59a9f7b66fb18f63fbe49;p=carl9170fw.git

Merge branch 'master' into radar

Conflicts:
	tools/.gitignore
---

781923f7697bd4c8bdd59a9f7b66fb18f63fbe49
diff --cc tools/.gitignore
index 8fec132,caffdb0..50aa885
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@@ -1,7 -1,6 +1,6 @@@
  src/checksum
  src/fwinfo
 -src/fwprepare
  src/miniboot
 +src/fwprepare
- src/eeprom_fix
  src/wol
  carlu/carlu