Merge tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 05:08:14 +0000 (22:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 05:08:14 +0000 (22:08 -0700)
commit33c2a174120b2c1baec9d1dac513f9d4b761b26a
tree9bd9a2c1ae13a3b123a238d9ebeabbc3cfe56a96
parent88265322c14cce39f7afbc416726ef4fac413298
parente3483a5f3a8ef448c229a2aceca9b2ad6a46b8ec
Merge tag 'stable/for-linus-3.7-tag' of git://git./linux/kernel/git/konrad/mm

Pull frontswap update from Konrad Rzeszutek Wilk:
 "Features:
   - Support exlusive get if backend is capable.
  Bug-fixes:
   - Fix compile warnings
   - Add comments/cleanup doc
   - Fix wrong if condition"

* tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
  frontswap: support exclusive gets if tmem backend is capable
  mm: frontswap: fix a wrong if condition in frontswap_shrink
  mm/frontswap: fix uninit'ed variable warning
  mm/frontswap: cleanup doc and comment error
  mm: frontswap: remove unneeded headers