Merge remote-tracking branch 'stefanha/trivial-patches' into staging

author Anthony Liguori <aliguori@us.ibm.com>

Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)

committer Anthony Liguori <aliguori@us.ibm.com>

Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)
author Anthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)
committer Anthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)
diff --cc hw/dp8393x.c
Simple merge
diff --cc target-sh4/helper.c
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 5 Dec 2011 14:44:33 +0000 (08:44 -0600)
		1	2
hw/dp8393x.c	patch \|	diff1 \|	diff2 \|	blob \| history
target-sh4/helper.c	patch \|	diff1 \|	diff2 \|	blob \| history