diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 16:35:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 16:35:35 -0700 |
commit | af9473118979f3b09ee5d92fdbd8014cf085f7c5 (patch) | |
tree | 922f5623f1861dcf00a33aca5d7f2ae6b7782cb1 /drivers/net/s2io.c | |
parent | 9f8e35fc0c1d96e5383eca5f0c7c963a9fadef57 (diff) | |
parent | 74c5b597e9c2fc728c61582afdea4971a5c8ed8f (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
modules: better error messages when modules fail to load due to a sysfs problem.
kobject: update documentation
kset: kernel-doc cleanups
driver core: revert "device" link creation check
stable_api_nonsense.txt: Disambiguate the use of "this" by using "that" to refer to the syscall interface
Fix Doc/sysfs-rules typos
kernel-doc fixes for PCI and drivers/base/
kobject: put kobject_actions in kobject.h
kobject: fix link error when CONFIG_HOTPLUG is disabled
HOWTO: sync Japanese HOWTO
HOWTO: adjust translation header of Japanese stable_api_nonsense.txt
Diffstat (limited to 'drivers/net/s2io.c')
0 files changed, 0 insertions, 0 deletions