diff options
| author | 2011-07-11 14:58:22 -0400 | |
|---|---|---|
| committer | 2011-07-11 14:58:22 -0400 | |
| commit | 4b42c542afbc119c4012324ea80e0c5a89afea4f (patch) | |
| tree | a67a788c7ba06cb40219b49505f84594dabc6f82 /tools/lib/python/kdoc/python_version.py | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| parent | Bluetooth: Fixes l2cap "command reject" reply according to spec (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'tools/lib/python/kdoc/python_version.py')
0 files changed, 0 insertions, 0 deletions
