diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-11-10 15:55:51 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-11-10 16:33:09 -0500 |
| commit | 1b00e1dcdeebda87467a0cfff9b9f5b06bb5857b (patch) | |
| tree | 72b3d0f2d410e99e001675be36dda9aff92433ea /include/linux | |
| parent | af1bdb79ca64ceadc7b44b11929b384eff66ce59 (diff) | |
| parent | d7c5d0dcffb3b5702d9477faceff4b8398e6fed0 (diff) | |
Merge commit 'd7c5d0dcffb3b5702d9477fa' into linaro-3.1
Conflicts:
arch/arm/mm/dma-mapping.c
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions