diff options
| author | Linus Torvalds <[email protected]> | 2011-06-27 02:40:31 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-06-27 02:40:31 +0000 |
| commit | 258e43fdb00c73d424b114ae3850accd55b27cbb (patch) | |
| tree | 62f252cc4cde2a816ad2d609d80616322b26da15 /net/lapb/lapb_iface.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff) | |
| download | kernel-258e43fdb00c73d424b114ae3850accd55b27cbb.tar.gz kernel-258e43fdb00c73d424b114ae3850accd55b27cbb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: mark CONFIG_CIFS_NFSD_EXPORT as BROKEN
cifs: free blkcipher in smbhash
Diffstat (limited to 'net/lapb/lapb_iface.c')
0 files changed, 0 insertions, 0 deletions