From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 24 Oct 2013 14:38:56 +0000 (-0400)
Subject: Merge branch 'devel/for-linus-3.13' into linux-next
X-Git-Tag: next-20131025~29^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=511b28f3c74eab42a5f68de4bafb9af31bee6811;p=karo-tx-linux.git

Merge branch 'devel/for-linus-3.13' into linux-next

* devel/for-linus-3.13:
  tracing/events: Fix swiotlb tracepoint creation
  tracing/events: Add bounce tracing to swiotbl
  xen/hvc: If we use xen_raw_printk let it also work on HVM guests.
  xen/mmu: Correct PAT MST setting.
---

511b28f3c74eab42a5f68de4bafb9af31bee6811