From: Linus Torvalds Date: Sun, 9 Nov 2008 19:14:16 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc X-Git-Tag: v2.6.28-rc4~8 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=02cabab4a8a7ef2d51189d5dda84516d36662910;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc: struct device - replace bus_id with dev_name(), dev_set_name() mmc: increase SD write timeout for crappy cards --- 02cabab4a8a7ef2d51189d5dda84516d36662910