git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e0701f2
29cc85f
)
Merge omap-drivers
author
Tony Lindgren
<tony@atomide.com>
Mon, 5 Mar 2007 12:24:30 +0000
(
04:24
-0800)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 5 Mar 2007 12:24:30 +0000
(
04:24
-0800)
Conflicts:
arch/arm/configs/omap_h2_1610_defconfig
arch/arm/configs/omap_osk_5912_defconfig
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/dsp/dsp_common.c
arch/arm/plat-omap/mailbox.c
drivers/Makefile
drivers/cbus/Kconfig
drivers/cbus/retu-pwrbutton.c
drivers/cbus/tahvo-usb.c
drivers/video/omap/Kconfig
drivers/video/omap/sossi.c
include/asm-arm/arch-omap/mailbox.h
1
2
arch/arm/oprofile/common.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/oprofile/common.c
Simple merge