]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 03:35:19 +0000 (13:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 03:35:19 +0000 (13:35 +1000)
Conflicts:
drivers/vhost/test.c

1  2 
arch/microblaze/include/asm/uaccess.h
arch/tile/include/asm/uaccess.h
drivers/vhost/test.c
include/linux/sched.h
kernel/sched/core.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge