Merge branch 'linus' into queue
authorMarcelo Tosatti <mtosatti@redhat.com>
Thu, 19 Apr 2012 20:06:26 +0000 (17:06 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Thu, 19 Apr 2012 20:06:26 +0000 (17:06 -0300)
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>

Trivial merge