Merge remote-tracking branch 'pmaydell/armhw-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Sun, 21 Aug 2011 23:34:33 +0000 (18:34 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Sun, 21 Aug 2011 23:34:33 +0000 (18:34 -0500)
1  2 
hw/stellaris.c

diff --cc hw/stellaris.c
Simple merge