]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 06:06:24 +0000 (23:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 06:06:24 +0000 (23:06 -0700)
commitf0deb97ab13ad1f89cd0993f7339655d59788405
tree41572e643cb4983115707ae330b5896ae76e1ea1
parent184475029a724b6b900d88fc3a5f462a6107d5af
parent21d541aa19e90752232bf6c43002f019f204f988
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:
  updated Documentation/ja_JP/SubmittingPatches
  debugfs: add documentation for debugfs_create_x64
  uio: uio_pdrv_genirq: Add OF support
  firmware: gsmi: remove sysfs entries when unload the module
  Documentation/zh_CN: Fix messy code file email-clients.txt
  driver core: add more help description for "path to uevent helper"
  driver-core: modify FIRMWARE_IN_KERNEL help message
  driver-core: Kconfig grammar corrections in firmware configuration
  DOCUMENTATION: Replace create_device() with device_create().
  DOCUMENTATION: Update overview.txt in Doc/driver-model.
  pti: pti_tty_install documentation mispelling.
drivers/base/Kconfig
drivers/misc/pti.c
drivers/uio/uio_pdrv_genirq.c