Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
authorLinus Torvalds <[email protected]>
Sun, 17 Aug 2008 20:01:30 +0000 (13:01 -0700)
committerLinus Torvalds <[email protected]>
Sun, 17 Aug 2008 20:01:30 +0000 (13:01 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  sdricoh_cs: removed unused #include <version.h>
  s3cmci: attach get_cd host ops
  s3cmci: fix sparse errors from non-exported functions


Trivial merge