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
This commit is contained in:
Konrad Rzeszutek Wilk 2012-07-19 18:53:41 -04:00
commit 78821b2c02
2 changed files with 92 additions and 62 deletions