]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'devel/for-linus-3.13' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 24 Oct 2013 14:38:56 +0000 (10:38 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 24 Oct 2013 14:38:56 +0000 (10:38 -0400)
* 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.

1  2 
drivers/tty/hvc/hvc_xen.c

Simple merge