projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 15fc5de d9e0d14)
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)
commitf720e7ea3a77cc9e88eb2b2bd762021646d6be52
tree0817a6c27a4b26d92eb00897a32f915f42ca1951tree | snapshot
parent15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9ccommit | diff
parentd9e0d149b5dcc2ef4688afc572b9906bcda941efcommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.