aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-24 15:42:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-24 15:42:08 -0800
commit694593e3374a67d95ece6a275a1f181644c2c4d8 (patch)
treedf083065019ded7607e460a7bea44f53deb505f8 /init/main.c
parentMerge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff)
parentproc: fix PG_locked reporting in /proc/kpageflags (diff)
downloadlinux-dev-694593e3374a67d95ece6a275a1f181644c2c4d8.tar.xz
linux-dev-694593e3374a67d95ece6a275a1f181644c2c4d8.zip
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
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions