| commit | 46479e698530b8197d601a23317b7c7654195338 | [log] [tgz] |
|---|---|---|
| author | Johan Hedberg <johan.hedberg@intel.com> | Thu Feb 16 14:23:04 2012 +0200 |
| committer | Johan Hedberg <johan.hedberg@intel.com> | Thu Feb 16 14:25:34 2012 +0200 |
| tree | 710b2758ecd7d8a6ada37724c5d4c8027d5f358f | |
| parent | 7b99b659d90c5d421cb1867295c78a4c0c030734 [diff] | |
| parent | ca994a36f585432458ead9133fcfe05440edbb7b [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git Conflicts: include/net/bluetooth/l2cap.h net/bluetooth/hci_conn.c net/bluetooth/l2cap_core.c