| commit | f415c413f458837bd0c27086b79aca889f9435e4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 25 21:24:49 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 25 21:24:49 2009 -0700 |
| tree | b5c09f326b07637f97ddc2c1795ffbbef62bed23 | |
| parent | 4dc627d55edad85e26ae81f17634bd4590993ba0 [diff] | |
| parent | 4484b9c8b4976acee181d377f8ba571109d1a2be [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * 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.