From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jul 2012 20:15:25 +0000 (-0700)
Subject: Merge tag 'stable/for-linus-3.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.6-rc1~122
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b849570264d9f802485e327b7a4b0c52991d26a;p=platform%2Fkernel%2Flinux-3.10.git

Merge tag 'stable/for-linus-3.6-rc0-tag' of git://git./linux/kernel/git/konrad/mm

Pull frontswap updates from Konrad Rzeszutek Wilk:
 "Cleanups in code and documentation.  Little bit of refactoring for
  cleaner look."

* tag 'stable/for-linus-3.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
  mm/frontswap: cleanup doc and comment error
  mm: frontswap: remove unneeded headers
  mm: frontswap: split out function to clear a page out
  mm: frontswap: remove unnecessary check during initialization
  mm: frontswap: make all branches of if statement in put page consistent
  mm: frontswap: split frontswap_shrink further to simplify locking
  mm: frontswap: split out __frontswap_unuse_pages
  mm: frontswap: split out __frontswap_curr_pages
  mm: frontswap: trivial coding convention issues
  mm: frontswap: remove casting from function calls through ops structure
---

2b849570264d9f802485e327b7a4b0c52991d26a