git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5e81905
2aeabcb
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
author
John W. Linville
<linville@tuxdriver.com>
Wed, 9 Nov 2011 19:54:33 +0000
(14:54 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 9 Nov 2011 19:54:33 +0000
(14:54 -0500)
Conflicts:
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff