diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 14:12:45 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 14:12:45 -0400 |
| commit | 0d41da2e31e81f5c8aaabe17f769de4304b2d4c8 (patch) | |
| tree | 540acefba9bf01d3880d7bacb767fbf9b1fe80b4 /Documentation/ioctl/ioctl-number.txt | |
| parent | a0089bd617adea27ebc352e1e0871649ab1dbaa6 (diff) | |
| parent | e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6 (diff) | |
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 'Documentation/ioctl/ioctl-number.txt')
| -rw-r--r-- | Documentation/ioctl/ioctl-number.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 845a191004b1..54078ed96b37 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt | |||
| @@ -319,4 +319,6 @@ Code Seq#(hex) Include File Comments | |||
| 319 | <mailto:thomas@winischhofer.net> | 319 | <mailto:thomas@winischhofer.net> |
| 320 | 0xF4 00-1F video/mbxfb.h mbxfb | 320 | 0xF4 00-1F video/mbxfb.h mbxfb |
| 321 | <mailto:raph@8d.com> | 321 | <mailto:raph@8d.com> |
| 322 | 0xF6 all LTTng Linux Trace Toolkit Next Generation | ||
| 323 | <mailto:mathieu.desnoyers@efficios.com> | ||
| 322 | 0xFD all linux/dm-ioctl.h | 324 | 0xFD all linux/dm-ioctl.h |