From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 8 May 2006 16:11:10 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc4~22
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=96b8eaa14a20771997b501a049e418b871bf9def;p=powerpc.git

Merge /pub/scm/linux/kernel/git/davem/net-2.6

* 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
---

96b8eaa14a20771997b501a049e418b871bf9def