From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Fri, 8 Dec 2006 16:47:07 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
X-Git-Tag: v2.6.20-rc1~34^2~40
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1709775828de83b099554176b6d4971ebc772962;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:
  mmc: fix au1xmmc build error
  mmc: pxamci compilation fix
---

1709775828de83b099554176b6d4971ebc772962