diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-06 22:39:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-06 22:39:31 -0400 |
| commit | 69259abb64d4da77273bf59accfc9fa79e7165f4 (patch) | |
| tree | bd043ab03a788b749c8d5ae4049d8defae9abf34 /drivers/acpi/acpica/exutils.c | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 (diff) | |
| parent | 12e94471b2be5ef9b55b10004a3a2cd819490036 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/pcnet_cs.c
net/caif/caif_socket.c
Diffstat (limited to 'drivers/acpi/acpica/exutils.c')
| -rw-r--r-- | drivers/acpi/acpica/exutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c index 74c24d517f81..4093522eed45 100644 --- a/drivers/acpi/acpica/exutils.c +++ b/drivers/acpi/acpica/exutils.c | |||
| @@ -109,7 +109,7 @@ void acpi_ex_enter_interpreter(void) | |||
| 109 | * | 109 | * |
| 110 | * DESCRIPTION: Reacquire the interpreter execution region from within the | 110 | * DESCRIPTION: Reacquire the interpreter execution region from within the |
| 111 | * interpreter code. Failure to enter the interpreter region is a | 111 | * interpreter code. Failure to enter the interpreter region is a |
| 112 | * fatal system error. Used in conjuction with | 112 | * fatal system error. Used in conjunction with |
| 113 | * relinquish_interpreter | 113 | * relinquish_interpreter |
| 114 | * | 114 | * |
| 115 | ******************************************************************************/ | 115 | ******************************************************************************/ |