git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4dc627d 4484b9c)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Aug 2009 04:24:49 +0000 (21:24 -0700)
committerLinus 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
Pandora Kernel Repository