Merge branch 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Jul 2010 16:30:59 +0000 (09:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Jul 2010 16:30:59 +0000 (09:30 -0700)
* 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev:
  mm: add context argument to shrinker callback to remaining shrinkers


Trivial merge