Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 23:51:55 +0000 (16:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 23:51:55 +0000 (16:51 -0700)
commitb142ebb61cd36370c6fac5e0b8261a6cd7bba782
treec08596ccf85dbcf0f14f878f7f468756d50d983c
parent218ce7351413b8287a80fab1d7b94906a5559f01
parent578454ff7eab61d13a26b568f99a89a2c9edc881
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:
  driver core: add devname module aliases to allow module on-demand auto-loading