git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a9d0a3
6de6c18
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
author
Gustavo F. Padovan
<padovan@profusion.mobi>
Thu, 9 Jun 2011 19:33:54 +0000
(16:33 -0300)
committer
Gustavo F. Padovan
<padovan@profusion.mobi>
Thu, 9 Jun 2011 19:33:54 +0000
(16:33 -0300)
Conflicts:
net/bluetooth/rfcomm/sock.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff