summaryrefslogtreecommitdiff
path: root/scripts/config
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-11-18 00:17:06 (GMT)
committerJames Morris <jmorris@namei.org>2011-11-18 00:17:06 (GMT)
commitfe8a0df46e5076429872887b467c538bc9c0c738 (patch)
tree8118ba6e7d052527a14970b081934a2935283174 /scripts/config
parent6aaf05f472c97ebceff47d9eef464574f1a55727 (diff)
parent40809565ca57a8e94bae20b22da014c44ec233f6 (diff)
downloadlinux-fe8a0df46e5076429872887b467c538bc9c0c738.tar.xz
Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus
Diffstat (limited to 'scripts/config')
0 files changed, 0 insertions, 0 deletions