Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Aug 2008 20:01:30 +0000 (13:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Aug 2008 20:01:30 +0000 (13:01 -0700)
commitabcf42419d24416175ea8bc9a502d833f64955d1
tree46a12062c52d08efdc545d918b2c29f218002273
parentfac296322c838e8dd425b13410ff7ada2856a8ee
parentfe7f962505892c7894c473cd78ade87767689c8d
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:
  sdricoh_cs: removed unused #include <version.h>
  s3cmci: attach get_cd host ops
  s3cmci: fix sparse errors from non-exported functions