Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dd7f883 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

parents cc896f08 344babaa

Documentation/DocBook/mcabook.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 


  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Earch/i386/kernel/mca.c

!Edrivers/mca/mca-legacy.c

  </chapter>



  <chapter id="dmafunctions">

drivers/net/wan/syncppp.c

+1 −0
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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