Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
0dd7f883
Commit
0dd7f883
authored
Sep 07, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
parents
cc896f08
344babaa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
4 deletions
+6
-4
Documentation/DocBook/mcabook.tmpl
Documentation/DocBook/mcabook.tmpl
+1
-1
drivers/net/wan/syncppp.c
drivers/net/wan/syncppp.c
+1
-0
drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
+2
-2
include/sound/pcm.h
include/sound/pcm.h
+1
-1
kernel/sched.c
kernel/sched.c
+1
-0
No files found.
Documentation/DocBook/mcabook.tmpl
View file @
0dd7f883
...
...
@@ -96,7 +96,7 @@
<chapter
id=
"pubfunctions"
>
<title>
Public Functions Provided
</title>
!E
arch/i386/kernel/mca
.c
!E
drivers/mca/mca-legacy
.c
</chapter>
<chapter
id=
"dmafunctions"
>
...
...
drivers/net/wan/syncppp.c
View file @
0dd7f883
...
...
@@ -1440,6 +1440,7 @@ static void sppp_print_bytes (u_char *p, u16 len)
* @skb: The buffer to process
* @dev: The device it arrived on
* @p: Unused
* @orig_dev: Unused
*
* Protocol glue. This drives the deferred processing mode the poorer
* cards use. This can be called directly by cards that do not have
...
...
drivers/scsi/libata-core.c
View file @
0dd7f883
...
...
@@ -2531,7 +2531,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
* @ap: port to read/write
* @buf: data buffer
* @buflen: buffer length
* @
do_write
: read/write
* @
write_data
: read/write
*
* Transfer data from/to the device data register by MMIO.
*
...
...
@@ -2577,7 +2577,7 @@ static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf,
* @ap: port to read/write
* @buf: data buffer
* @buflen: buffer length
* @
do_write
: read/write
* @
write_data
: read/write
*
* Transfer data from/to the device data register by PIO.
*
...
...
include/sound/pcm.h
View file @
0dd7f883
...
...
@@ -903,7 +903,7 @@ int snd_pcm_format_unsigned(snd_pcm_format_t format);
int
snd_pcm_format_linear
(
snd_pcm_format_t
format
);
int
snd_pcm_format_little_endian
(
snd_pcm_format_t
format
);
int
snd_pcm_format_big_endian
(
snd_pcm_format_t
format
);
/*
*
/*
* snd_pcm_format_cpu_endian - Check the PCM format is CPU-endian
* @format: the format to check
*
...
...
kernel/sched.c
View file @
0dd7f883
...
...
@@ -1478,6 +1478,7 @@ static inline void prepare_task_switch(runqueue_t *rq, task_t *next)
/**
* finish_task_switch - clean up after a task-switch
* @rq: runqueue associated with task-switch
* @prev: the thread we just switched away from.
*
* finish_task_switch must be called after the context switch, paired
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment