git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b99b65
ca994a3
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
Johan Hedberg
<johan.hedberg@intel.com>
Thu, 16 Feb 2012 12:23:04 +0000
(14:23 +0200)
committer
Johan Hedberg
<johan.hedberg@intel.com>
Thu, 16 Feb 2012 12:25:34 +0000
(14:25 +0200)
Conflicts:
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff