diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 18:12:45 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 18:12:45 (GMT) |
| commit | 0d41da2e31e81f5c8aaabe17f769de4304b2d4c8 (patch) | |
| tree | 540acefba9bf01d3880d7bacb767fbf9b1fe80b4 /arch/x86/lib/copy_user_64.S | |
| parent | a0089bd617adea27ebc352e1e0871649ab1dbaa6 (diff) | |
| parent | e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6 (diff) | |
| download | linux-fsl-qoriq-0d41da2e31e81f5c8aaabe17f769de4304b2d4c8.tar.xz | |
Merge branch 'pm-fixes' into pm-domains
Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(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
Diffstat (limited to 'arch/x86/lib/copy_user_64.S')
0 files changed, 0 insertions, 0 deletions