diff options
| author | 2012-06-11 22:36:42 -0300 | |
|---|---|---|
| committer | 2012-06-11 22:36:42 -0300 | |
| commit | cbe461c526e1e0f8b55f91180df64f02d8daed45 (patch) | |
| tree | e0d785c63d550d81cb42960ac490aebef4bc965c /tools/lib/python/kdoc/python_version.py | |
| parent | Bluetooth: Fix style in hidp code (diff) | |
| parent | Bluetooth: Add support for encryption key refresh (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Conflicts:
net/bluetooth/hci_event.c
Diffstat (limited to 'tools/lib/python/kdoc/python_version.py')
0 files changed, 0 insertions, 0 deletions
