projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
202f2bb
6443bb1
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 25 Apr 2010 23:28:56 +0000
(16:28 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 25 Apr 2010 23:28:56 +0000
(16:28 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipv6: Fix inet6_csk_bind_conflict()
e100: Fix the TX workqueue race
Trivial merge