tree df083065019ded7607e460a7bea44f53deb505f8
parent 21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d
parent e07a4b9217d1e97d2f3a62b6b070efdc61212110
author Linus Torvalds <torvalds@linux-foundation.org> 1235518928 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235518928 -0800

Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
  proc: fix PG_locked reporting in /proc/kpageflags