git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
27615a9
2b6c4e7
)
Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers
author
Tony Lindgren
<tony@atomide.com>
Wed, 17 Oct 2012 17:01:30 +0000
(10:01 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 17 Oct 2012 17:01:30 +0000
(10:01 -0700)
Conflicts:
drivers/crypto/omap-aes.c
drivers/crypto/omap-sham.c
drivers/dma/omap-dma.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff