]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes-for-linus-for-3.6-rc2' of git://git.linaro.org/people/mszyprowski...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Aug 2012 18:30:30 +0000 (21:30 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Aug 2012 18:30:30 +0000 (21:30 +0300)
commit9c5e25f1cc194cec344572a13c78ddf783c3a7c0
tree0817a6c27a4b26d92eb00897a32f915f42ca1951
parentb0529f26808f3b1e329f3f24d443634f08ece1cc
parent18f42a60b2e2c4d3cf5055514e0119836a946178
Merge branch 'fixes-for-linus-for-3.6-rc2' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull three dma-mapping fixes from Marek Szyprowski.

* 'fixes-for-linus-for-3.6-rc2' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: fix incorrect freeing of atomic allocations
  ARM: dma-mapping: fix atomic allocation alignment
  ARM: mm: fix MMU mapping of CMA regions