summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-09-27 11:03:40 +1000
committerJames Morris <james.l.morris@oracle.com>2012-09-27 11:03:40 +1000
commit3585e96cd1049682b8a19a0b699422156e9d735b (patch)
tree4d7df3950f5de97ca3b20f46a80a46005120df8f /usr
parent0a72ba7aff26fb6e918cee6d2bbfd289069f10ae (diff)
parent78a0d8f5d1e9c4a91ee97fc590abbf6e56803769 (diff)
Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next
Requested by Casey.
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions