From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Feb 2009 23:42:08 +0000 (-0800)
Subject: Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan... 
X-Git-Tag: v2.6.29-rc7~61
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=694593e3374a67d95ece6a275a1f181644c2c4d8;p=users%2Fjedix%2Flinux-maple.git

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
---

694593e3374a67d95ece6a275a1f181644c2c4d8