]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 23:40:30 +0000 (16:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 23:40:30 +0000 (16:40 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  at91_mci: minor cleanup
  mmc: mmc host test driver
  mmc: Fix omap compile by replacing dev_name with dma_dev_name


Trivial merge