Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
authorPierre Ossman <drzeus@drzeus.cx>
Sun, 12 Oct 2008 09:08:46 +0000 (11:08 +0200)
committerPierre Ossman <drzeus@drzeus.cx>
Sun, 12 Oct 2008 09:08:46 +0000 (11:08 +0200)
commit6ee6c6adf1cfebbf432b8d1f204c7f96e395933e
treecf8f017f44b768445eecb6698c47d479c6b46a01
parent162350eb75fcb81ec0ea34f042f1deddb759aea8
parent5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51
Merge branch 'master' of git://git./linux/kernel/git/hskinnemoen/atmel-mci-2.6.28

Conflicts:
drivers/mmc/host/atmel-mci.c
drivers/mmc/host/Kconfig