]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen-tip/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 06:15:22 +0000 (16:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 06:15:22 +0000 (16:15 +1000)
commitc543a3242b53400b88230882bd3cdb75749a65ba
treec96e51287be848c671300befe6d4995c60c9e1b0
parentaaa09e8e7d2a3affbab2efe6e85392c3ad285425
parent278edfc07875779a69277f6c5773ec9318a994ee
Merge remote-tracking branch 'xen-tip/linux-next'

Conflicts:
drivers/xen/Kconfig
arch/x86/xen/enlighten.c
drivers/xen/Kconfig
drivers/xen/Makefile
drivers/xen/xen-scsiback.c