]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1817398 06862d7)
Merge branch 'cpuidle-fix' into fixes
authorTony Lindgren <tony@atomide.com>
Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)
1  2 
arch/arm/mach-omap2/omap_device.c patch | diff1 | diff2 | blob | history
drivers/soc/ti/omap_prm.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/omap_device.c
Simple merge
diff --cc drivers/soc/ti/omap_prm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.