git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d859898
e2fd318
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetoot...
author
John W. Linville
<linville@tuxdriver.com>
Mon, 11 Jul 2011 18:58:22 +0000
(14:58 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Mon, 11 Jul 2011 18:58:22 +0000
(14:58 -0400)
Conflicts:
net/bluetooth/l2cap_core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff