From: Linus Torvalds Date: Fri, 2 May 2008 18:02:53 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 X-Git-Tag: v2.6.26-rc1~12 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8;p=linux-2.6-omap-h63xx.git 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 --- 37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8