projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bed7a56 0eb1bd2)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 8 May 2006 16:11:10 +0000 (09:11 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 8 May 2006 16:11:10 +0000 (09:11 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IRDA] irda-usb: use NULL instead of 0
  [IPV4]: Remove likely in ip_rcv_finish()
  [NET]: Create netdev attribute_groups with class_device_add
  [CLASS DEVICE]: add attribute_group creation


Trivial merge
John Crispins staging tree