Commit 0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a
Exists in
master
and in
7 other branches
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Showing 5 changed files Side-by-side Diff
Documentation/DocBook/mcabook.tmpl
drivers/net/wan/syncppp.c
... | ... | @@ -1440,6 +1440,7 @@ |
1440 | 1440 | * @skb: The buffer to process |
1441 | 1441 | * @dev: The device it arrived on |
1442 | 1442 | * @p: Unused |
1443 | + * @orig_dev: Unused | |
1443 | 1444 | * |
1444 | 1445 | * Protocol glue. This drives the deferred processing mode the poorer |
1445 | 1446 | * cards use. This can be called directly by cards that do not have |
drivers/scsi/libata-core.c
... | ... | @@ -2531,7 +2531,7 @@ |
2531 | 2531 | * @ap: port to read/write |
2532 | 2532 | * @buf: data buffer |
2533 | 2533 | * @buflen: buffer length |
2534 | - * @do_write: read/write | |
2534 | + * @write_data: read/write | |
2535 | 2535 | * |
2536 | 2536 | * Transfer data from/to the device data register by MMIO. |
2537 | 2537 | * |
... | ... | @@ -2577,7 +2577,7 @@ |
2577 | 2577 | * @ap: port to read/write |
2578 | 2578 | * @buf: data buffer |
2579 | 2579 | * @buflen: buffer length |
2580 | - * @do_write: read/write | |
2580 | + * @write_data: read/write | |
2581 | 2581 | * |
2582 | 2582 | * Transfer data from/to the device data register by PIO. |
2583 | 2583 | * |
include/sound/pcm.h
... | ... | @@ -903,7 +903,7 @@ |
903 | 903 | int snd_pcm_format_linear(snd_pcm_format_t format); |
904 | 904 | int snd_pcm_format_little_endian(snd_pcm_format_t format); |
905 | 905 | int snd_pcm_format_big_endian(snd_pcm_format_t format); |
906 | -/** | |
906 | +/* | |
907 | 907 | * snd_pcm_format_cpu_endian - Check the PCM format is CPU-endian |
908 | 908 | * @format: the format to check |
909 | 909 | * |
kernel/sched.c
... | ... | @@ -1478,6 +1478,7 @@ |
1478 | 1478 | |
1479 | 1479 | /** |
1480 | 1480 | * finish_task_switch - clean up after a task-switch |
1481 | + * @rq: runqueue associated with task-switch | |
1481 | 1482 | * @prev: the thread we just switched away from. |
1482 | 1483 | * |
1483 | 1484 | * finish_task_switch must be called after the context switch, paired |