git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dd48dc3
aabdfd6
)
Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
author
David S. Miller
<davem@davemloft.net>
Sat, 4 Feb 2012 21:42:19 +0000
(16:42 -0500)
committer
David S. Miller
<davem@davemloft.net>
Sat, 4 Feb 2012 21:42:19 +0000
(16:42 -0500)
Conflicts:
drivers/net/can/usb/ems_usb.c
Minor dev_warn --> netdev_warn conversion conflicts.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff