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: (75 commits) PM: merge device power-management source files sysfs: add copyrights kobject: update the copyrights kset: add some kerneldoc to help describe what these strange things are Driver core: rename ktype_edd and ktype_efivar Driver core: rename ktype_driver Driver core: rename ktype_device Driver core: rename ktype_class driver core: remove subsystem_init() sysfs: move sysfs file poll implementation to sysfs_open_dirent sysfs: implement sysfs_open_dirent sysfs: move sysfs_dirent->s_children into sysfs_dirent->s_dir sysfs: make sysfs_root a regular directory dirent sysfs: open code sysfs_attach_dentry() sysfs: make s_elem an anonymous union sysfs: make bin attr open get active reference of parent too sysfs: kill unnecessary NULL pointer check in sysfs_release() sysfs: kill unnecessary sysfs_get() in open paths sysfs: reposition sysfs_dirent->s_mode. sysfs: kill sysfs_update_file() ...
Showing
- Documentation/ja_JP/HOWTO 45 additions, 39 deletionsDocumentation/ja_JP/HOWTO
- Documentation/kernel-parameters.txt 4 additions, 0 deletionsDocumentation/kernel-parameters.txt
- Documentation/kobject.txt 2 additions, 20 deletionsDocumentation/kobject.txt
- arch/ia64/sn/kernel/tiocx.c 1 addition, 2 deletionsarch/ia64/sn/kernel/tiocx.c
- arch/powerpc/kernel/of_device.c 11 additions, 26 deletionsarch/powerpc/kernel/of_device.c
- arch/powerpc/kernel/vio.c 3 additions, 13 deletionsarch/powerpc/kernel/vio.c
- arch/powerpc/platforms/ps3/system-bus.c 2 additions, 7 deletionsarch/powerpc/platforms/ps3/system-bus.c
- block/bsg.c 1 addition, 4 deletionsblock/bsg.c
- block/elevator.c 1 addition, 1 deletionblock/elevator.c
- block/genhd.c 8 additions, 27 deletionsblock/genhd.c
- block/ll_rw_blk.c 1 addition, 1 deletionblock/ll_rw_blk.c
- drivers/acpi/bus.c 1 addition, 1 deletiondrivers/acpi/bus.c
- drivers/acpi/scan.c 9 additions, 7 deletionsdrivers/acpi/scan.c
- drivers/acpi/video.c 2 additions, 2 deletionsdrivers/acpi/video.c
- drivers/amba/bus.c 3 additions, 6 deletionsdrivers/amba/bus.c
- drivers/base/Kconfig 8 additions, 0 deletionsdrivers/base/Kconfig
- drivers/base/base.h 0 additions, 2 deletionsdrivers/base/base.h
- drivers/base/bus.c 74 additions, 42 deletionsdrivers/base/bus.c
- drivers/base/class.c 19 additions, 41 deletionsdrivers/base/class.c
- drivers/base/core.c 32 additions, 76 deletionsdrivers/base/core.c
Loading
Please register or sign in to comment