| commit | 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e | [log] [tgz] |
|---|---|---|
| author | Pierre Ossman <drzeus@drzeus.cx> | Sun Oct 12 11:08:46 2008 +0200 |
| committer | Pierre Ossman <drzeus@drzeus.cx> | Sun Oct 12 11:08:46 2008 +0200 |
| tree | cf8f017f44b768445eecb6698c47d479c6b46a01 | |
| parent | 162350eb75fcb81ec0ea34f042f1deddb759aea8 [diff] | |
| parent | 5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28 Conflicts: drivers/mmc/host/atmel-mci.c