projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb3613a 53da4ce)
Merge branch 'pm-opp' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 01:05:57 +0000 (17:05 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 01:05:57 +0000 (17:05 -0800)
1  2 
arch/arm/mach-omap2/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/pm.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/Makefile
Simple merge
diff --cc arch/arm/mach-omap2/pm.h
Simple merge