git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2928238 722154e)
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Thu, 6 May 2010 12:21:04 +0000 (22:21 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 6 May 2010 12:21:04 +0000 (22:21 +1000)
commit043b4d40f53131c5f72eca2a46555fe35328a930
tree02a40eeb688f7ed9730e26a22f39ad7e04378de2tree
parent292823814261e085cdcef06b6b691e6c2563fbd4commit | diff
parent722154e4cacf015161efe60009ae9be23d492296commit | diff
Merge branch 'master' into next

Conflicts:
security/keys/keyring.c

Resolved conflict with whitespace fix in find_keyring_by_name()

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