| commit | 96b8eaa14a20771997b501a049e418b871bf9def | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Mon, 8 May 2006 16:11:10 +0000 (8 09:11 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Mon, 8 May 2006 16:11:10 +0000 (8 09:11 -0700) | ||
| tree | 31d9724f7628fab85bbb0a08e694450770494e96 | treesnapshot (tar.gz zip) |
| parent | bed7a560333d40269a886c4421d4c8f964a32177 | commitdiff |
| parent | 0eb1bd210d94e9f2c87551d794bb2755e5e24eed | commitdiff |
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
* 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