Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 May 2008 18:02:53 +0000 (11:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 May 2008 18:02:53 +0000 (11:02 -0700)
commit37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8
tree96e6e5fbb15451ec281966706e2f6f3a5419fd61
parent3482a6f1d1447b618d37049529cf36a8dc3bd3e3
parent06916639e2fed9ee475efef2747a1b7429f8fe76
Merge git://git./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