git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e93aabb
6132ae8
318007e
05822c8
)
Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq...
author
Sascha Hauer
<s.hauer@pengutronix.de>
Thu, 29 Sep 2011 08:40:29 +0000
(10:40 +0200)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Thu, 29 Sep 2011 08:40:29 +0000
(10:40 +0200)
Conflicts:
arch/arm/plat-mxc/avic.c
arch/arm/plat-mxc/include/mach/common.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff