Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)
1  2 
hw/dp8393x.c
target-sh4/helper.c

diff --cc hw/dp8393x.c
Simple merge
Simple merge