git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0670b8a
0302b86
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Fri, 19 Nov 2010 21:13:47 +0000
(13:13 -0800)
committer
David S. Miller
<davem@davemloft.net>
Fri, 19 Nov 2010 21:13:47 +0000
(13:13 -0800)
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff