Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable

This commit is contained in:
Russell King 2011-07-18 23:00:42 +01:00
commit 07f1c295de
55 changed files with 304 additions and 288 deletions