From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 19 Jul 2012 22:53:41 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.6' into linux-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=78821b2c0299ab807d483802f09897728b93bce0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'stable/for-linus-3.6' into linux-next

* stable/for-linus-3.6:
  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
---

78821b2c0299ab807d483802f09897728b93bce0