projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b080e04
c091c71
)
Merge branch 'fixes-for-v3.14' of git://git.linaro.org/people/mszyprowski/linux-dma...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 20 Feb 2014 19:58:56 +0000
(11:58 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 20 Feb 2014 19:58:56 +0000
(11:58 -0800)
Pull DMA-mapping fixes from Marek Szyprowski:
"This contains fixes for incorrect atomic test in dma-mapping subsystem
for ARM and x86 architecture"
* 'fixes-for-v3.14' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
x86: dma-mapping: fix GFP_ATOMIC macro usage
ARM: dma-mapping: fix GFP_ATOMIC macro usage
Trivial merge