projects
/
profile
/
common
/
kernel-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4dc627d
4484b9c
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 26 Aug 2009 04:24:49 +0000
(21:24 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 26 Aug 2009 04:24:49 +0000
(21:24 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
irda/sa1100_ir: fix broken netdev_ops conversion
irda/au1k_ir: fix broken netdev_ops conversion
pkt_sched: Fix bogon in tasklet_hrtimer changes.
Trivial merge