summaryrefslogtreecommitdiff
path: root/fs/proc/uptime.c
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2013-05-07 10:19:47 +0400
committerPekka Enberg <penberg@kernel.org>2013-05-07 10:19:47 +0400
commit69df2ac1288b456a95aceadafbf88cd891a577c8 (patch)
tree0f2e83a8c4bc826f12d3f3871ecc1d7be0c9e4e3 /fs/proc/uptime.c
parentc1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff)
parent8a965b3baa89ffedc73c0fbc750006c631012ced (diff)
downloadlinux-69df2ac1288b456a95aceadafbf88cd891a577c8.tar.xz
Merge branch 'slab/next' into slab/for-linus
Diffstat (limited to 'fs/proc/uptime.c')
0 files changed, 0 insertions, 0 deletions