git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d9dd966
8df54d6
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Sat, 11 Feb 2012 04:32:28 +0000
(23:32 -0500)
committer
David S. Miller
<davem@davemloft.net>
Sat, 11 Feb 2012 04:32:28 +0000
(23:32 -0500)
Conflicts:
drivers/infiniband/hw/nes/nes_cm.c
Simple whitespace conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff