From: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Date: Wed, 18 Jan 2012 09:52:01 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/texane/stlink
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b746f60732ce8771af1ca011938736c210bbc68a;p=fw%2Fstlink

Merge branch 'master' of git://github.com/texane/stlink

Conflicts:
	gdbserver/Makefile
---

b746f60732ce8771af1ca011938736c210bbc68a