git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f058925 72d3105)
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Mon, 22 Sep 2008 00:41:56 +0000 (17:41 -0700)
committerJames Morris <jmorris@namei.org>
Mon, 22 Sep 2008 00:41:56 +0000 (17:41 -0700)
commitab2b49518e743962f71b94246855c44ee9cf52cc
tree26b260a350f0a0a0d19b558bf147b812e3a1564ctree
parentf058925b201357fba48d56cc9c1719ae274b2022commit | diff
parent72d31053f62c4bc464c2783974926969614a8649commit | diff
Merge branch 'master' into next

Conflicts:

MAINTAINERS

Thanks for breaking my tree :-)

Signed-off-by: James Morris <jmorris@namei.org>
MAINTAINERS diff1 | diff2 | blob | history
security/selinux/ss/services.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.