diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-28 00:48:50 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-28 00:48:50 +0000 |
commit | a6c856bc7d6d2f8dd3aca87333145a556142ffeb (patch) | |
tree | 3ba772672d1cde6f2f85ee33064a4c6fed51ec61 /block | |
parent | 14dad497a83d44d3ea66ddd452d03b8f026f7f4d (diff) | |
parent | 0ea1ec713f04bdfac343c9702b21cd3a7c711826 (diff) | |
parent | 79a71f26a10430ae6eb74d8a056f7782216b27e6 (diff) | |
parent | 1ff44433c661c30afde6e6d2c47a29039a293da4 (diff) | |
parent | 223016339ce72f67930a6d9c6d41839bc3046e46 (diff) | |
parent | c08b1874a3b6c01cc783f872c7342fe82476cae3 (diff) |
Merge branches 'fixes', 'misc', 'mmci', 'unstable/dma-for-next' and 'sa11x0' into for-next