GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 23:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'for-next' into for-linus

Browse source 
Conflicts:

	kernel/irq/chip.c
This commit is contained in:
Jiri Kosina 2009-12-07 18:36:35 +01:00
commit d014d04386
490 changed files with 721 additions and 832 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/scsi/pmcraid.c
View file

@ -3342,7 +3342,7 @@ static int pmcraid_chr_fasync(int fd, struct file *filep, int mode)
* @direction : data transfer direction
*
* Return value
* 0 on sucess, non-zero error code on failure
* 0 on success, non-zero error code on failure
*/
static int pmcraid_build_passthrough_ioadls(
struct pmcraid_cmd *cmd,
@ -3401,7 +3401,7 @@ static int pmcraid_build_passthrough_ioadls(
* @direction: data transfer direction
*
* Return value
* 0 on sucess, non-zero error code on failure
* 0 on success, non-zero error code on failure
*/
static void pmcraid_release_passthrough_ioadls(
struct pmcraid_cmd *cmd,
@ -3429,7 +3429,7 @@ static void pmcraid_release_passthrough_ioadls(
* @arg: pointer to pmcraid_passthrough_buffer user buffer
*
* Return value
* 0 on sucess, non-zero error code on failure
* 0 on success, non-zero error code on failure
*/
static long pmcraid_ioctl_passthrough(
struct pmcraid_instance *pinstance,