diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-08 21:11:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-08 21:11:47 -0400 |
commit | 837525e344298335ea56c3b8c9ca7abbc97f0285 (patch) | |
tree | e7afd356670edab6f3550fa9cc0eb9c926b590df /Documentation/firmware_class/README | |
parent | 217397d7d267f832081169016e1ab66691a13e08 (diff) | |
parent | 87d37a4f470834223fc8a243af002998bdb5b886 (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:
firmware: remove orphaned Email
kobject: use the proper printk level for kobject error
Driver core: kill unused code
Driver core: keep PHYSDEV for old struct class_device
update Documentation/driver-model/platform.txt
Diffstat (limited to 'Documentation/firmware_class/README')
-rw-r--r-- | Documentation/firmware_class/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/firmware_class/README b/Documentation/firmware_class/README index e9cc8bb26f7d..c3480aa66ba8 100644 --- a/Documentation/firmware_class/README +++ b/Documentation/firmware_class/README | |||
@@ -1,7 +1,7 @@ | |||
1 | 1 | ||
2 | request_firmware() hotplug interface: | 2 | request_firmware() hotplug interface: |
3 | ------------------------------------ | 3 | ------------------------------------ |
4 | Copyright (C) 2003 Manuel Estrada Sainz <ranty@debian.org> | 4 | Copyright (C) 2003 Manuel Estrada Sainz |
5 | 5 | ||
6 | Why: | 6 | Why: |
7 | --- | 7 | --- |