tree 962391f7718c5e49ac003ef53633a2e3625515b6
parent daf3761c9fcde0f4ca64321cbed6c1c86d304193
parent 9d99c7123c9af5f47a2037933a3ffaec3e37efad
author Linus Torvalds <torvalds@linux-foundation.org> 1444498273 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1444498273 -0700

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