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)
commit02cabab4a8a7ef2d51189d5dda84516d36662910
tree1e6773a81e151d4744f8d643bda5348ac49561fa
parentbbda14dfba26bd4ca5dc74f672518bc42120d765
parentd1b268630875a7713b5d468a0c03403c5b721c8e
Merge branch 'for-linus' of git://git./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