Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Apr 2010 01:24:27 +0000 (18:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Apr 2010 01:24:27 +0000 (18:24 -0700)
* 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


Trivial merge