commit | 02cabab4a8a7ef2d51189d5dda84516d36662910 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 09 11:14:16 2008 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 09 11:14:16 2008 -0800 |
tree | 1e6773a81e151d4744f8d643bda5348ac49561fa | |
parent | bbda14dfba26bd4ca5dc74f672518bc42120d765 [diff] | |
parent | d1b268630875a7713b5d468a0c03403c5b721c8e [diff] |
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