diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-03 13:51:02 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 13:51:02 -0800 |
commit | a7fca0ccecd3f5a111e08df8439f0b884099ad59 (patch) | |
tree | 44b360a8f367e2414daf3ad92622ab2544ac0fbd /include/net/sctp/user.h | |
parent | 424eff975192553a9ea8bfd51bf65039ffb356ef (diff) | |
parent | 2861453b1b5e022fd5e1294b8fbf39254440b661 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'include/net/sctp/user.h')
0 files changed, 0 insertions, 0 deletions