From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 10 Oct 2015 17:31:13 +0000 (-0700)
Subject: Merge branch 'stable/for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d8a12d1de9d9d025d66c1b2a580a293cc5050e5;p=linux-beck.git

Merge branch 'stable/for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb fixlet from Konrad Rzeszutek Wilk:
 "Enable the SWIOTLB under 32-bit PAE kernels.

  Nowadays most distros enable this due to CONFIG_HYPERVISOR|XEN=y which
  select SWIOTLB.  But for those that are not interested in
  virtualization and wanting to use 32-bit PAE kernels and wanting to
  have working DMA operations - this configures it for them"

* 'stable/for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: Enable it under x86 PAE
---

1d8a12d1de9d9d025d66c1b2a580a293cc5050e5