Merge remote-tracking branch 'aneesh/for-upstream-7' into staging

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

Mon, 31 Oct 2011 16:06:02 +0000 (11:06 -0500)

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

Mon, 31 Oct 2011 16:06:02 +0000 (11:06 -0500)
author Anthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 16:06:02 +0000 (11:06 -0500)
committer Anthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 16:06:02 +0000 (11:06 -0500)
diff --cc Makefile.objs
Simple merge
diff --cc vl.c
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 31 Oct 2011 16:06:02 +0000 (11:06 -0500)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 31 Oct 2011 16:06:02 +0000 (11:06 -0500)
		1	2
Makefile.objs	patch \|	diff1 \|	diff2 \|	blob \| history
vl.c	patch \|	diff1 \|	diff2 \|	blob \| history