Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 16:54:48 +0000 (08:54 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 16:54:48 +0000 (08:54 -0800)
commite55cec4ff1080e36ed1dbfaee46fe05d64f4eae2
treea099822ac61fcde695f090a34ed277b81b566d87
parent6d3154cc1143f62c3b80d9929caeaec6db8cb451
parent6f949909e8f9e5d7e5584dc48d9a5e060c52aed1
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: Correct definition of R6
  omap: Update MMC response types