From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Aug 2008 20:01:30 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
X-Git-Tag: v2.6.27-rc4~46
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abcf42419d24416175ea8bc9a502d833f64955d1;p=linux-2.6

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:
  sdricoh_cs: removed unused #include <version.h>
  s3cmci: attach get_cd host ops
  s3cmci: fix sparse errors from non-exported functions
---

abcf42419d24416175ea8bc9a502d833f64955d1