summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-02 10:12:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-02 10:12:01 -0800
commitbcc2f9b718d0be9cd77551d37c28daf4ebbc570c (patch)
tree5debda8b953b288bd547d2be8e36046746762fb0 /kernel/trace
parentaeac81033bc04c9e7e3ecf5b93f476d26d4cb25b (diff)
parent14883a75ec76b44759385fb12629f4a0f1aef4e3 (diff)
downloadop-kernel-dev-bcc2f9b718d0be9cd77551d37c28daf4ebbc570c.zip
op-kernel-dev-bcc2f9b718d0be9cd77551d37c28daf4ebbc570c.tar.gz
Merge tag 'stable/for-linus-3.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen bug-fixes from Konrad Rzeszutek Wilk: "Fixes to patches that went in this merge window along with a latent bug: - Fix lazy flushing in case m2p override fails. - Fix module compile issues with ARM/Xen - Add missing call to DMA map page for Xen SWIOTLB for ARM" * tag 'stable/for-linus-3.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/gnttab: leave lazy MMU mode in the case of a m2p override failure xen/arm: p2m_init and p2m_lock should be static arm/xen: Export phys_to_mach to fix Xen module link errors swiotlb-xen: add missing xen_dma_map_page call
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud