projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9af2ebb 0aed043)
Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 00:29:28 +0000 (17:29 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 00:29:28 +0000 (17:29 -0700)
1  2 
arch/arm/mach-omap2/Makefile patch | diff1 | diff2 | blob | history
arch/arm/plat-omap/include/plat/omap_hwmod.h patch | diff1 | diff2 | blob | history
arch/arm/plat-omap/omap_device.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/Makefile
Simple merge
diff --cc arch/arm/plat-omap/omap_device.c
Simple merge