tree f5ccff7795b2ad5e47f17fb475599c526f533e79
parent f71fa31f9f7ac33cba12b8897983f950ad2c7a5b
parent 19853301ef3289bda2d5264c1093e74efddaeab9
author Marcelo Tosatti <mtosatti@redhat.com> 1334865986 -0300
committer Marcelo Tosatti <mtosatti@redhat.com> 1334865986 -0300

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>