diff options
| author | Linus Torvalds | 2008-04-22 00:49:58 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-04-22 00:49:58 +0200 |
| commit | e80ab411e589e00550e2e6e5a6a02d59cc730357 (patch) | |
| tree | 870225ff7b5b8d03e82a996963213a4bb9cce248 /Documentation/DocBook | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/... (diff) | |
| parent | SCSI: convert struct class_device to struct device (diff) | |
| download | kernel-qcow2-linux-e80ab411e589e00550e2e6e5a6a02d59cc730357.tar.gz kernel-qcow2-linux-e80ab411e589e00550e2e6e5a6a02d59cc730357.tar.xz kernel-qcow2-linux-e80ab411e589e00550e2e6e5a6a02d59cc730357.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits)
SCSI: convert struct class_device to struct device
DRM: remove unused dev_class
IB: rename "dev" to "srp_dev" in srp_host structure
IB: convert struct class_device to struct device
memstick: convert struct class_device to struct device
driver core: replace remaining __FUNCTION__ occurrences
sysfs: refill attribute buffer when reading from offset 0
PM: Remove destroy_suspended_device()
Firmware: add iSCSI iBFT Support
PM: Remove legacy PM (fix)
Kobject: Replace list_for_each() with list_for_each_entry().
SYSFS: Explicitly include required header file slab.h.
Driver core: make device_is_registered() work for class devices
PM: Convert wakeup flag accessors to inline functions
PM: Make wakeup flags available whenever CONFIG_PM is set
PM: Fix misuse of wakeup flag accessors in serial core
Driver core: Call device_pm_add() after bus_add_device() in device_add()
PM: Handle device registrations during suspend/resume
block: send disk "change" event for rescan_partitions()
sysdev: detect multiple driver registrations
...
Fixed trivial conflict in include/linux/memory.h due to semaphore header
file change (made irrelevant by the change to mutex).
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/kernel-api.tmpl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index dc0f30c3e571..488dd4a4945b 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl @@ -297,11 +297,6 @@ X!Earch/x86/kernel/mca_32.c !Ikernel/acct.c </chapter> - <chapter id="pmfuncs"> - <title>Power Management</title> -!Ekernel/power/pm.c - </chapter> - <chapter id="devdrivers"> <title>Device drivers infrastructure</title> <sect1><title>Device Drivers Base</title> |