git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
034ee29
5839fec
)
Merge branch 'next/fixes' into next/cleanup
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 22:25:41 +0000
(23:25 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 22:25:41 +0000
(23:25 +0100)
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff