git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
547ba92
5717922
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Mon, 5 May 2008 20:21:13 +0000
(13:21 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 5 May 2008 20:21:13 +0000
(13:21 -0700)
Merge branches 'master' and 'linus'
Conflicts:
arch/arm/mach-omap1/board-h3.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/media/video/Kconfig
drivers/misc/Kconfig
include/linux/kfifo.h
security/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff