Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Mon, 12 Dec 2011 07:54:58 +0000 (07:54 +0000)
committerJon Medhurst <tixy@linaro.org>
Mon, 12 Dec 2011 07:54:58 +0000 (07:54 +0000)
1  2 
driver/gator_main.c

Simple merge