git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5170c05
949ff5b
)
Merge branch 'rmk_cookie_fixes2' into next
author
Vinod Koul
<vinod.koul@linux.intel.com>
Tue, 13 Mar 2012 07:09:49 +0000
(12:39 +0530)
committer
Vinod Koul
<vinod.koul@linux.intel.com>
Tue, 13 Mar 2012 07:09:49 +0000
(12:39 +0530)
Conflicts:
drivers/dma/imx-dma.c
drivers/dma/pl330.c
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff