From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Dec 2009 03:43:33 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: v2.6.33-rc1~342
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
  tree-wide: fix misspelling of "definition" in comments
  reiserfs: fix misspelling of "journaled"
  doc: Fix a typo in slub.txt.
  inotify: remove superfluous return code check
  hdlc: spelling fix in find_pvc() comment
  doc: fix regulator docs cut-and-pasteism
  mtd: Fix comment in Kconfig
  doc: Fix IRQ chip docs
  tree-wide: fix assorted typos all over the place
  drivers/ata/libata-sff.c: comment spelling fixes
  fix typos/grammos in Documentation/edac.txt
  sysctl: add missing comments
  fs/debugfs/inode.c: fix comment typos
  sgivwfb: Make use of ARRAY_SIZE.
  sky2: fix sky2_link_down copy/paste comment error
  tree-wide: fix typos "couter" -> "counter"
  tree-wide: fix typos "offest" -> "offset"
  fix kerneldoc for set_irq_msi()
  spidev: fix double "of of" in comment
  comment typo fix: sybsystem -> subsystem
  ...
---

4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8
diff --cc drivers/block/cciss_cmd.h
index b50a9b261b852,8098fccdbec4b..6afa700890fff
--- a/drivers/block/cciss_cmd.h
+++ b/drivers/block/cciss_cmd.h
@@@ -5,10 -5,9 +5,10 @@@
  //###########################################################################
  #define CISS_VERSION "1.00"
  
- //general boundary defintions
+ //general boundary definitions
  #define SENSEINFOBYTES          32//note that this value may vary between host implementations
 -#define MAXSGENTRIES            31
 +#define MAXSGENTRIES            32
 +#define CCISS_SG_CHAIN          0x80000000
  #define MAXREPLYQS              256
  
  //Command Status value
diff --cc sound/isa/opti9xx/miro.c
index 6123c75311101,ddad60ef3f37d..b865e45a8f9ba
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@@ -127,13 -121,23 +127,13 @@@ struct snd_miro 
  	long mpu_port;
  	int mpu_irq;
  
 -	unsigned long aci_port;
 -	int aci_vendor;
 -	int aci_product;
 -	int aci_version;
 -	int aci_amp;
 -	int aci_preamp;
 -	int aci_solomode;
 -
 -	struct mutex aci_mutex;
 +	struct snd_miro_aci *aci;
  };
  
 -static void snd_miro_proc_init(struct snd_miro * miro);
 +static struct snd_miro_aci aci_device;
  
  static char * snd_opti9xx_names[] = {
- 	"unkown",
+ 	"unknown",
  	"82C928", "82C929",
  	"82C924", "82C925",
  	"82C930", "82C931", "82C933"