Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Mar 2011 04:45:12 +0000 (20:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Mar 2011 04:45:12 +0000 (20:45 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: sdio: Allow sdio operations in other threads during sdio_add_func()


Trivial merge