diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 18:08:31 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 18:08:31 +0000 |
| commit | aa312be1987d43216e72ffce42bccf6bf81f62ed (patch) | |
| tree | b994c25fc1492d7ff70d2ca83c64106b4883a808 /drivers/media | |
| parent | 31edf274f9aff1ccd39934a0b2fce38f4405c656 (diff) | |
| parent | 8c11a94d86eb5489dc665bc566bf624e329d89fa (diff) | |
| parent | 38d624361b2a82d6317c379aebf81b1b28210bb0 (diff) | |
Merge branches 'mmci' and 'pl011-dma' into devel