summaryrefslogtreecommitdiffstats
path: root/drivers/pps
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-26 06:24:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-26 06:24:49 +0200
commitf415c413f458837bd0c27086b79aca889f9435e4 (patch)
treeb5c09f326b07637f97ddc2c1795ffbbef62bed23 /drivers/pps
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parentirda/sa1100_ir: fix broken netdev_ops conversion (diff)
downloadlinux-f415c413f458837bd0c27086b79aca889f9435e4.tar.xz
linux-f415c413f458837bd0c27086b79aca889f9435e4.zip
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.
Diffstat (limited to 'drivers/pps')
0 files changed, 0 insertions, 0 deletions