projects / profile / common / kernel-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 398b60a 0cb637b)
Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jan 2014 16:17:09 +0000 (08:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jan 2014 16:17:09 +0000 (08:17 -0800)
Pull swiotlb bug-fixes from Konrad Rzeszutek Wilk:
 - Don't DoS with 'swiotlb is full' message.
 - Documentation update.

* tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2)
  swiotlb: update format

1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
lib/swiotlb.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc lib/swiotlb.c
Simple merge
Domain: SCM / Uncategorized;