OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
15fc5de
d9e0d14
)
Merge branch 'fixes-for-linus-for-3.6-rc2' of git://git.linaro.org/people/mszyprowski...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 12 Aug 2012 18:30:30 +0000
(21:30 +0300)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 12 Aug 2012 18:30:30 +0000
(21:30 +0300)
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
Trivial merge