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
  ...

diff --cc Documentation/scsi/ChangeLog.megaraid_sas
Simple merge

diff --cc arch/arm/mach-s3c2410/Kconfig
Simple merge

diff --cc arch/arm/mach-s3c2440/Kconfig
Simple merge

diff --cc arch/arm/mach-s5pc100/Kconfig
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/iomux-mx3.h
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/omap16xx.h
Simple merge

diff --cc arch/arm/plat-s3c/Kconfig
Simple merge

diff --cc arch/arm/plat-s3c24xx/Kconfig
Simple merge

diff --cc arch/arm/plat-s5pc1xx/Kconfig
Simple merge

diff --cc arch/ia64/ia32/ia32_entry.S
Simple merge

diff --cc arch/ia64/kernel/perfmon.c
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc drivers/ata/ata_piix.c
Simple merge

diff --cc drivers/ata/libata-sff.c
Simple merge

diff --cc drivers/ata/sata_fsl.c
Simple merge

diff --cc drivers/block/cciss_cmd.h
index b50a9b261b8526d95a4d4208ef3e85b8db2f4484,8098fccdbec4bacccb0226f1b0fdf969eb2edca5..6afa700890fffc5d01cf81c83151e487b5c92e1f
--- 1/drivers/block/cciss_cmd.h
--- 2/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 drivers/bluetooth/btmrvl_sdio.c
Simple merge

diff --cc drivers/char/mem.c
Simple merge

diff --cc drivers/firewire/core-topology.c
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/net/appletalk/cops.c
Simple merge

diff --cc drivers/net/atl1c/atl1c_main.c
Simple merge

diff --cc drivers/net/benet/be_cmds.h
Simple merge

diff --cc drivers/net/benet/be_main.c
Simple merge

diff --cc drivers/net/bnx2x_reg.h
Simple merge

diff --cc drivers/net/bonding/bond_alb.c
Simple merge

diff --cc drivers/net/cxgb3/sge.c
Simple merge

diff --cc drivers/net/iseries_veth.c
Simple merge

diff --cc drivers/net/lib82596.c
Simple merge

diff --cc drivers/net/ps3_gelic_net.c
Simple merge

diff --cc drivers/net/qla3xxx.c
Simple merge

diff --cc drivers/net/sis900.c
Simple merge

diff --cc drivers/net/sky2.c
Simple merge

diff --cc drivers/net/smsc911x.c
Simple merge

diff --cc drivers/net/spider_net.c
Simple merge

diff --cc drivers/net/tokenring/ibmtr.c
Simple merge

diff --cc drivers/net/tokenring/smctr.c
Simple merge

diff --cc drivers/net/ucc_geth.c
Simple merge

diff --cc drivers/net/wan/hdlc_fr.c
Simple merge

diff --cc drivers/net/wan/lmc/lmc_main.c
Simple merge

diff --cc drivers/net/wimax/i2400m/rx.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/base.h
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/phy.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/b43legacy/main.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/libipw_module.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/rx.c
Simple merge

diff --cc drivers/net/wireless/libertas/if_sdio.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2400pci.h
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2500pci.h
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2500usb.h
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt61pci.h
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt73usb.h
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_mac.c
Simple merge

diff --cc drivers/s390/char/fs3270.c
Simple merge

diff --cc drivers/s390/net/qeth_core_mpc.h
Simple merge

diff --cc drivers/scsi/3w-9xxx.c
Simple merge

diff --cc drivers/scsi/3w-xxxx.c
Simple merge

diff --cc drivers/scsi/53c700.c
Simple merge

diff --cc drivers/scsi/bfa/include/protocol/ct.h
Simple merge

diff --cc drivers/scsi/bnx2i/bnx2i_iscsi.c
Simple merge

diff --cc drivers/scsi/hptiop.c
Simple merge

diff --cc drivers/scsi/libfc/fc_lport.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_attr.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_els.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_sli.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_mbox.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_scsih.c
Simple merge

diff --cc drivers/scsi/pmcraid.c
Simple merge

diff --cc drivers/spi/spidev.c
Simple merge

diff --cc drivers/staging/wavelan/wavelan_cs.c
Simple merge

diff --cc drivers/video/omap/lcd_ams_delta.c
Simple merge

diff --cc drivers/video/omap/lcd_mipid.c
Simple merge

diff --cc fs/bio.c
Simple merge

diff --cc fs/compat_ioctl.c
Simple merge

diff --cc fs/notify/inotify/inotify_user.c
Simple merge

diff --cc fs/reiserfs/fix_node.c
Simple merge

diff --cc include/linux/in6.h
Simple merge

diff --cc include/linux/sysctl.h
Simple merge

diff --cc include/net/sctp/structs.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc include/net/wimax.h
Simple merge

diff --cc kernel/time/clocksource.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc net/bluetooth/bnep/core.c
Simple merge

diff --cc net/ipv4/netfilter/ipt_ECN.c
Simple merge

diff --cc net/mac80211/mesh_pathtbl.c
Simple merge

diff --cc net/sched/act_api.c
Simple merge

diff --cc net/sctp/sm_sideeffect.c
Simple merge

diff --cc net/sctp/sm_statefuns.c
Simple merge

diff --cc sound/isa/cs423x/cs4236.c
Simple merge

diff --cc sound/isa/opti9xx/miro.c
index 6123c753111010d87395fa0545721a321ea1f869,ddad60ef3f37d909120c7f78db196c04c4f72a8a..b865e45a8f9ba6c437f48e21b330fbf148df7ce7
--- 1/sound/isa/opti9xx/miro.c
--- 2/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"

diff --cc sound/isa/opti9xx/opti92x-ad1848.c
Simple merge

diff --cc sound/oss/Kconfig
Simple merge

diff --cc sound/pci/ca0106/ca0106_proc.c
Simple merge

diff --cc sound/pci/emu10k1/emu10k1x.c
Simple merge

diff --cc sound/pci/hda/patch_cirrus.c
Simple merge

diff --cc sound/pci/hda/patch_cmedia.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

diff --cc sound/pci/ice1712/juli.c
Simple merge

diff --cc sound/soc/codecs/uda134x.c
Simple merge

diff --cc sound/soc/codecs/wm8903.c
Simple merge

diff --cc sound/soc/codecs/wm8993.c
Simple merge

diff --cc sound/soc/s3c24xx/s3c24xx_simtec.c
Simple merge

diff --cc sound/soc/s6000/s6000-pcm.c
Simple merge