projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cbb616 3047454)
Merge branch 'for_3.2/pm-cleanup-2' of git://github.com/khilman/linux-omap-pm into...
authorTony Lindgren <tony@atomide.com>
Sat, 5 Nov 2011 00:40:52 +0000 (17:40 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 5 Nov 2011 00:40:52 +0000 (17:40 -0700)
1  2 
arch/arm/mach-omap2/id.c patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/pm34xx.c patch | diff1 | diff2 | blob | history
arch/arm/plat-omap/include/plat/cpu.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/id.c
Simple merge
diff --cc arch/arm/mach-omap2/pm34xx.c
Simple merge
diff --cc arch/arm/plat-omap/include/plat/cpu.h
Simple merge
Motorola kernel-slsi