diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 20:40:47 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 20:40:47 +0200 |
| commit | a04fd1aa4f807e2f97632a46070306e1389264ed (patch) | |
| tree | fc2511add6defbbcb3f5285ef78fd0c34ccc5512 /net/lapb/lapb_iface.c | |
| parent | 16ace6317db2c47b36b08b0addfe91356151c08d (diff) | |
| parent | 935be4945512eb37461a226c51ede5e8b05cbe24 (diff) | |
| download | kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.tar.gz kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.tar.xz kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.zip | |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
crypto/userspace/ncr-data.c
crypto/userspace/ncr_int.h
examples/Makefile
examples/ncr.c
examples/pk.c
examples/speed.c
ncr-int.h
ncr_int.h
Diffstat (limited to 'net/lapb/lapb_iface.c')
0 files changed, 0 insertions, 0 deletions