| commit | 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e | |
| author | Pierre Ossman <drzeus@drzeus.cx> | |
| Sun, 12 Oct 2008 09:08:46 +0000 (12 11:08 +0200) | ||
| committer | Pierre Ossman <drzeus@drzeus.cx> | |
| Sun, 12 Oct 2008 09:08:46 +0000 (12 11:08 +0200) | ||
| tree | cf8f017f44b768445eecb6698c47d479c6b46a01 | treesnapshot (tar.gz zip) |
| parent | 162350eb75fcb81ec0ea34f042f1deddb759aea8 | commitdiff |
| parent | 5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51 | commitdiff |
Merge branch 'master' of git://git./linux/kernel/git/hskinnemoen/atmel-mci-2.6.28
Conflicts:
drivers/mmc/host/atmel-mci.c
Conflicts:
drivers/mmc/host/atmel-mci.c
| drivers/mmc/host/Kconfig | diff1 | diff2 | blobhistory |