summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-11-27 00:35:32 +1100
committerJames Morris <james.l.morris@oracle.com>2014-11-27 00:35:32 +1100
commitac14ae25b676d721b6bfcfb046dc53a9f7760d83 (patch)
tree71d0cd79a23bbd744effe37441be2c328399a4e6 /block
parenta6aacbde406eeb6f8fc218b2c6172825f5e73fcf (diff)
parent5c1b66240b7f4abc29c618a768121d6a00f4c95a (diff)
Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions