summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-08 09:11:10 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-08 09:11:10 -0700
commit96b8eaa14a20771997b501a049e418b871bf9def (patch)
tree31d9724f7628fab85bbb0a08e694450770494e96 /arch
parentbed7a560333d40269a886c4421d4c8f964a32177 (diff)
parent0eb1bd210d94e9f2c87551d794bb2755e5e24eed (diff)
Merge master.kernel.org:/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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions