From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Thu, 19 Apr 2012 20:06:26 +0000 (-0300)
Subject: Merge branch 'linus' into queue
X-Git-Tag: v3.5-rc1~88^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eac0556750e727ff39144a9a9e59d5ccf1fc0e2a;p=pandora-kernel.git

Merge branch 'linus' into queue

Merge reason: development work has dependency on kvm patches merged
upstream.

Conflicts:
	Documentation/feature-removal-schedule.txt

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

eac0556750e727ff39144a9a9e59d5ccf1fc0e2a
Reading git-diff-tree failed