tree 2f6dffd2d3e4dd67355a224de7e7a960335a92fd
parent 11c34c7deaeeebcee342cbc35e1bb2a6711b2431
parent 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1260339278 +1100
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1260339278 +1100

Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h