Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2008 19:14:16 +0000 (11:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2008 19:14:16 +0000 (11:14 -0800)
* '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


Trivial merge