git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Rafael J. Wysocki <rjw@sisk.pl>
	Mon, 26 Sep 2011 18:12:45 +0000 (20:12 +0200)
committer	Rafael J. Wysocki <rjw@sisk.pl>
	Mon, 26 Sep 2011 18:12:45 +0000 (20:12 +0200)
commit	f7a6d10387c52c581db12ef1fbba95429a2da8ac
tree	540acefba9bf01d3880d7bacb767fbf9b1fe80b4	tree \| snapshot
parent	cc2caa82ac3dbaa8af8cb2372d444df6ffb18212	commit \| diff
parent	6871a8072c9c3b22ae3b3d394034610890fb59fe	commit \| diff

Merge branch 'pm-fixes' into pm-domains

Merge commit 6871a8072c9c3b22ae3b3d394034610890fb59fe
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.

Conflicts:
drivers/base/power/clock_ops.c

Linux Kernel Source Tree.

RSS Atom

arch/arm/mach-shmobile/board-ap4evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/sh7372.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-sh7372.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/clock_ops.c	diff1 \|	diff2 \|	blob \| history