Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Feb 2009 23:42:08 +0000 (15:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Feb 2009 23:42:08 +0000 (15:42 -0800)
commit694593e3374a67d95ece6a275a1f181644c2c4d8
treedf083065019ded7607e460a7bea44f53deb505f8
parent21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d
parente07a4b9217d1e97d2f3a62b6b070efdc61212110
Merge branch 'proc-linus' of git://git./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