summaryrefslogtreecommitdiff
path: root/include/linux/magic.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2008-10-13 02:35:14 +0400
committerJames Morris <jmorris@namei.org>2008-10-13 02:35:14 +0400
commit93db628658197aa46bd7f83d429908b6f187ec9c (patch)
treeb09496f42570a5864212eb8cfde4ba2ea9fa7a40 /include/linux/magic.h
parentf1b2a5ace996de339292d4035f9f5b294aecd11e (diff)
parent0da939b0058742ad2d8580b7db6b966d0fc72252 (diff)
downloadlinux-93db628658197aa46bd7f83d429908b6f187ec9c.tar.xz
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/magic.h')
0 files changed, 0 insertions, 0 deletions