commit | cbe461c526e1e0f8b55f91180df64f02d8daed45 | [log] [tgz] |
---|---|---|
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | Mon Jun 11 22:36:42 2012 -0300 |
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | Mon Jun 11 22:36:42 2012 -0300 |
tree | e0d785c63d550d81cb42960ac490aebef4bc965c | |
parent | 1d0c4da8f717937aeda47a72bc769d80f8776795 [diff] | |
parent | 1c2e004183178e1947882cd2e74f37826f45230e [diff] |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth Conflicts: net/bluetooth/hci_event.c