diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-19 03:30:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-19 03:30:39 -0400 |
| commit | 407d819cf0fd54c6fc1138a509225696aecafd15 (patch) | |
| tree | b653a5c8c09f7c316f5f98947be262e27a4ca33a /net/sctp | |
| parent | 7abbcd6a4c8d6179121f2915a761b1133bf1cd99 (diff) | |
| parent | b1235d79611e78a07629b4cbe53291c9cffd1834 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions