Merge branch 'driver-core-next' of...
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits) debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning sysfs: remove "last sysfs file:" line from the oops messages drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION" memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION SYSFS: Fix erroneous comments for sysfs_update_group(). driver core: remove the driver-model structures from the documentation driver core: Add the device driver-model structures to kerneldoc Translated Documentation/email-clients.txt RAW driver: Remove call to kobject_put(). reboot: disable usermodehelper to prevent fs access efivars: prevent oops on unload when efi is not enabled Allow setting of number of raw devices as a module parameter Introduce CONFIG_GOOGLE_FIRMWARE driver: Google Memory Console driver: Google EFI SMI x86: Better comments for get_bios_ebda() x86: get_bios_ebda_length() misc: fix ti-st build issues params.c: Use new strtobool function to process boolean inputs debugfs: move to new strtobool ... Fix up trivial conflicts in fs/debugfs/file.c due to the same patch being applied twice, and an unrelated cleanup nearby.
Showing
- Documentation/ABI/testing/sysfs-firmware-dmi 9 additions, 9 deletionsDocumentation/ABI/testing/sysfs-firmware-dmi
- Documentation/ABI/testing/sysfs-firmware-gsmi 58 additions, 0 deletionsDocumentation/ABI/testing/sysfs-firmware-gsmi
- Documentation/ABI/testing/sysfs-firmware-log 7 additions, 0 deletionsDocumentation/ABI/testing/sysfs-firmware-log
- Documentation/ABI/testing/sysfs-kernel-fscaps 8 additions, 0 deletionsDocumentation/ABI/testing/sysfs-kernel-fscaps
- Documentation/DocBook/device-drivers.tmpl 3 additions, 3 deletionsDocumentation/DocBook/device-drivers.tmpl
- Documentation/driver-model/bus.txt 1 addition, 18 deletionsDocumentation/driver-model/bus.txt
- Documentation/driver-model/class.txt 1 addition, 16 deletionsDocumentation/driver-model/class.txt
- Documentation/driver-model/device.txt 1 addition, 90 deletionsDocumentation/driver-model/device.txt
- Documentation/driver-model/driver.txt 1 addition, 17 deletionsDocumentation/driver-model/driver.txt
- Documentation/ja_JP/HOWTO 43 additions, 86 deletionsDocumentation/ja_JP/HOWTO
- Documentation/zh_CN/email-clients.txt 210 additions, 0 deletionsDocumentation/zh_CN/email-clients.txt
- arch/arm/kernel/traps.c 0 additions, 1 deletionarch/arm/kernel/traps.c
- arch/powerpc/kernel/traps.c 0 additions, 1 deletionarch/powerpc/kernel/traps.c
- arch/sh/kernel/traps_32.c 0 additions, 1 deletionarch/sh/kernel/traps_32.c
- arch/unicore32/kernel/traps.c 0 additions, 1 deletionarch/unicore32/kernel/traps.c
- arch/x86/include/asm/bios_ebda.h 26 additions, 2 deletionsarch/x86/include/asm/bios_ebda.h
- arch/x86/kernel/dumpstack.c 0 additions, 1 deletionarch/x86/kernel/dumpstack.c
- drivers/base/core.c 3 additions, 4 deletionsdrivers/base/core.c
- drivers/base/dd.c 8 additions, 4 deletionsdrivers/base/dd.c
- drivers/base/memory.c 11 additions, 18 deletionsdrivers/base/memory.c
Loading
Please register or sign in to comment