Merge branch 'upmaster' into ft2232_gpio_danger
commitc7427a0c84edd3905e682eaee673c5de81e1e74b
authorrodrigo_l_rosa <rodrigorosa.lg@gmail.com>
Tue, 29 Nov 2011 22:29:24 +0000 (29 14:29 -0800)
committerrodrigo_l_rosa <rodrigorosa.lg@gmail.com>
Tue, 29 Nov 2011 22:29:24 +0000 (29 14:29 -0800)
tree5395bed67bd60fd3ca09f8c01f588330c9c792c9
parentd5fd584e06dc0dffd577ca04a2a11d9378ab229e
parentea54ea5364b855ffc6d2733463308a63f9a8e307
Merge branch 'upmaster' into ft2232_gpio_danger
src/openocd.c
src/target/target.c