projects
/
users
/
jedix
/
linux-maple.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9995ffe
33cb722
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
author
John W. Linville <linville@tuxdriver.com>
Tue, 6 Dec 2011 19:59:32 +0000
(14:59 -0500)
committer
John W. Linville <linville@tuxdriver.com>
Tue, 6 Dec 2011 19:59:32 +0000
(14:59 -0500)
Trivial merge