tree a099822ac61fcde695f090a34ed277b81b566d87
parent 6d3154cc1143f62c3b80d9929caeaec6db8cb451
parent 6f949909e8f9e5d7e5584dc48d9a5e060c52aed1
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1169484888 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1169484888 -0800

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: Correct definition of R6
  omap: Update MMC response types