git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ed819e3 efe6a8a)

author	Rafael J. Wysocki <rjw@sisk.pl>
	Fri, 16 Mar 2012 20:49:24 +0000 (21:49 +0100)
committer	Rafael J. Wysocki <rjw@sisk.pl>
	Fri, 16 Mar 2012 20:49:24 +0000 (21:49 +0100)
commit	59fb53ea75eef4aa029cf31c88cdacec2f7b794b
tree	fb2ee7f8e99a72fe858e76ba7f2dbbc0390f3128	tree \| snapshot (tar.gz zip)
parent	ed819e3b964bba8bfae8e65d4d55a3f345f8da16	commit \| diff
parent	efe6a8ad7fc55b350ce968cae4c757d35e986285	commit \| diff

Merge branch 'pm-qos'

* pm-qos:
  sh_mmcif / PM: Use PM QoS latency constraint
  tmio_mmc / PM: Use PM QoS latency constraint
  PM / QoS: Make it possible to expose PM QoS latency constraints

drivers/mmc/host/sh_mmcif.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/tmio_mmc_pio.c	diff1 \|	diff2 \|	blob \| history
include/linux/pm.h	diff1 \|	diff2 \|	blob \| history