tree 96e6e5fbb15451ec281966706e2f6f3a5419fd61
parent 3482a6f1d1447b618d37049529cf36a8dc3bd3e3
parent 06916639e2fed9ee475efef2747a1b7429f8fe76
author Linus Torvalds <torvalds@linux-foundation.org> 1209751373 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209751373 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  driver-core: add dev_name() to help transition away from using bus_id