summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85e2efb 37cd4fe e811d32)
raw | combined (merge: 85e2efb 37cd4fe e811d32)
| author | Tony Lindgren <tony@atomide.com> | |
| Wed, 16 Feb 2011 19:32:38 +0000 (11:32 -0800) | ||
| committer | Tony Lindgren <tony@atomide.com> | |
| Wed, 16 Feb 2011 19:32:38 +0000 (11:32 -0800) |
| 1 | 2 | 3 | |||
|---|---|---|---|---|---|
| arch/arm/mach-omap2/Kconfig | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| arch/arm/mach-omap2/Makefile | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| arch/arm/mach-omap2/common.c | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| arch/arm/mach-omap2/io.c | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| arch/arm/mach-omap2/irq.c | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| arch/arm/plat-omap/include/plat/cpu.h | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| arch/arm/plat-omap/include/plat/io.h | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| drivers/usb/musb/musb_core.c | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| drivers/usb/musb/musb_core.h | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| drivers/usb/musb/musbhsdma.h | patch | | diff1 | | diff2 | | diff3 | | blob | history |
diff --cc arch/arm/mach-omap2/Kconfig
Simple merge
diff --cc arch/arm/mach-omap2/Makefile
Simple merge
diff --cc arch/arm/mach-omap2/common.c
Simple merge
diff --cc arch/arm/mach-omap2/io.c
Simple merge
diff --cc arch/arm/mach-omap2/irq.c
Simple merge
diff --cc arch/arm/plat-omap/include/plat/cpu.h
Simple merge
diff --cc arch/arm/plat-omap/include/plat/io.h
Simple merge
diff --cc drivers/usb/musb/musb_core.c
Simple merge
diff --cc drivers/usb/musb/musb_core.h
Simple merge
diff --cc drivers/usb/musb/musbhsdma.h
Simple merge