projects / platform / kernel / kernel-mfld-blackbay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55a4e78 032a642)
Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap...
authorTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:46:36 +0000 (14:46 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:46:36 +0000 (14:46 -0800)
1  2 
arch/arm/mach-omap2/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge
diff --cc arch/arm/mach-omap2/Makefile
Simple merge
Domain: System / Uncategorized;