]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'xen-tip/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:26:46 +0000 (18:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:26:46 +0000 (18:26 +1100)
1  2 
drivers/block/xen-blkfront.c
drivers/xen/Kconfig

Simple merge
Simple merge