diff options
author | Miloslav Trmač <mitr@redhat.com> | 2010-07-27 17:49:21 +0200 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-27 17:49:21 +0200 |
commit | d5c2b894102e59efe499c231a32065afcf37e463 (patch) | |
tree | 4140b45a2d4290c10eb3d20e39ac63eafcc051eb /net/lapb/lapb_iface.c | |
parent | a04fd1aa4f807e2f97632a46070306e1389264ed (diff) | |
parent | 9a2369d426b23f77884b01666370140d10b41c19 (diff) | |
download | kernel-crypto-d5c2b894102e59efe499c231a32065afcf37e463.tar.gz kernel-crypto-d5c2b894102e59efe499c231a32065afcf37e463.tar.xz kernel-crypto-d5c2b894102e59efe499c231a32065afcf37e463.zip |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
COPYING
examples/pk.c
Diffstat (limited to 'net/lapb/lapb_iface.c')
0 files changed, 0 insertions, 0 deletions