From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Jan 2016 23:19:42 +0000 (-0800)
Subject: Merge branch 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-4.8.0-22.24~1948
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ad233aca21509d337c78d32a50d2116cd6943031;p=mirror_ubuntu-zesty-kernel.git

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

Pull swiotlb patchlet from Konrad Rzeszutek Wilk:
 "One trivial patch.

  Another patch (from Fengguang) is already in your tree courtesy of
  Andrew Morton - but I would prefer not to rebase my tree.  Hence the
  diff is very small"

* 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: Make linux/swiotlb.h standalone includible
  MAINTAINERS: add git URL for swiotlb
---

ad233aca21509d337c78d32a50d2116cd6943031