linux/arch/um/include
Marcelo Tosatti eac0556750 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>
2012-04-19 17:06:26 -03:00
..
asm Merge branch 'linus' into queue 2012-04-19 17:06:26 -03:00
shared um: kill HOST_TASK_PID 2012-03-25 00:29:55 +01:00