Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
commita2340be047aaf026cbec6ee649c3f1eaf2bc7bd7
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Apr 2010 01:24:27 +0000 (22 18:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Apr 2010 01:24:27 +0000 (22 18:24 -0700)
tree644d8c2a5315b55012f82d7902c29434cf5d20b8
parent7db2ccddd112d8b4b0d0dd7f309ebd8b39373fbb
parenta30dcb4f68fb60440f71b3e62bc5c15f631d14f9
Merge git://git./linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  sysfs: use sysfs_attr_init in ASUS atk0110 driver
  Documentation/HOWTO: update git home URL
  Documentation: -stable rules: upstream commit ID requirement reworded