Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187730
b: refs/heads/master
c: edf86ba
h: refs/heads/master
v: v3
  • Loading branch information
Adam Buchbinder authored and Jiri Kosina committed Feb 4, 2010
1 parent 96fe517 commit 366a107
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a61aa401638529cd4231f6106980d307fba98fa
refs/heads/master: edf86baae2e92bc03615086b2a341cd6d56c20f2
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ acpi_system_write_wakeup_device(struct file *file,
found_dev->wakeup.gpe_device)) {
printk(KERN_WARNING
"ACPI: '%s' and '%s' have the same GPE, "
"can't disable/enable one seperately\n",
"can't disable/enable one separately\n",
dev->pnp.bus_id, found_dev->pnp.bus_id);
dev->wakeup.state.enabled =
found_dev->wakeup.state.enabled;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/mISDN/l1oip_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,7 @@ l1oip_init(void)
printk(KERN_DEBUG "%s: interface %d is %s with %s.\n",
__func__, l1oip_cnt, pri ? "PRI" : "BRI",
bundle ? "bundled IP packet for all B-channels" :
"seperate IP packets for every B-channel");
"separate IP packets for every B-channel");

hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC);
if (!hc) {
Expand Down

0 comments on commit 366a107

Please sign in to comment.