git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4544833
017b029
)
Merge remote-tracking branch 'bluetooth/master'
author
Stephen Rothwell
<sfr@canb.auug.org.au>
Mon, 30 May 2011 02:11:50 +0000
(12:11 +1000)
committer
Stephen Rothwell
<sfr@canb.auug.org.au>
Mon, 30 May 2011 02:11:50 +0000
(12:11 +1000)
Conflicts:
net/bluetooth/l2cap_core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff