Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Linus Torvalds [Thu, 10 Dec 2009 03:43:33 +0000 (19:43 -0800)]
* '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
  ...

110 files changed:
1  2 
Documentation/scsi/ChangeLog.megaraid_sas
arch/arm/mach-s3c2410/Kconfig
arch/arm/mach-s3c2440/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/plat-mxc/include/mach/iomux-mx3.h
arch/arm/plat-omap/dma.c
arch/arm/plat-omap/include/plat/omap16xx.h
arch/arm/plat-s3c/Kconfig
arch/arm/plat-s3c24xx/Kconfig
arch/arm/plat-s5pc1xx/Kconfig
arch/ia64/ia32/ia32_entry.S
arch/ia64/kernel/perfmon.c
arch/x86/kernel/acpi/boot.c
drivers/ata/ata_piix.c
drivers/ata/libata-sff.c
drivers/ata/sata_fsl.c
drivers/block/cciss_cmd.h
drivers/bluetooth/btmrvl_sdio.c
drivers/char/mem.c
drivers/firewire/core-topology.c
drivers/mtd/nand/Kconfig
drivers/net/appletalk/cops.c
drivers/net/atl1c/atl1c_main.c
drivers/net/benet/be_cmds.h
drivers/net/benet/be_main.c
drivers/net/bnx2x_reg.h
drivers/net/bonding/bond_alb.c
drivers/net/cxgb3/sge.c
drivers/net/iseries_veth.c
drivers/net/lib82596.c
drivers/net/ps3_gelic_net.c
drivers/net/qla3xxx.c
drivers/net/sis900.c
drivers/net/sky2.c
drivers/net/smsc911x.c
drivers/net/spider_net.c
drivers/net/tokenring/ibmtr.c
drivers/net/tokenring/smctr.c
drivers/net/ucc_geth.c
drivers/net/wan/hdlc_fr.c
drivers/net/wan/lmc/lmc_main.c
drivers/net/wimax/i2400m/rx.c
drivers/net/wireless/ath/ath5k/base.h
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2x00/libipw_module.c
drivers/net/wireless/iwmc3200wifi/rx.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/rt2x00/rt2400pci.h
drivers/net/wireless/rt2x00/rt2500pci.h
drivers/net/wireless/rt2x00/rt2500usb.h
drivers/net/wireless/rt2x00/rt61pci.h
drivers/net/wireless/rt2x00/rt73usb.h
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/s390/char/fs3270.c
drivers/s390/net/qeth_core_mpc.h
drivers/scsi/3w-9xxx.c
drivers/scsi/3w-xxxx.c
drivers/scsi/53c700.c
drivers/scsi/bfa/include/protocol/ct.h
drivers/scsi/bnx2i/bnx2i_iscsi.c
drivers/scsi/hptiop.c
drivers/scsi/libfc/fc_lport.c
drivers/scsi/lpfc/lpfc_attr.c
drivers/scsi/lpfc/lpfc_els.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/lpfc/lpfc_sli.c
drivers/scsi/megaraid/megaraid_mbox.c
drivers/scsi/mpt2sas/mpt2sas_scsih.c
drivers/scsi/pmcraid.c
drivers/spi/spidev.c
drivers/staging/wavelan/wavelan_cs.c
drivers/video/omap/lcd_ams_delta.c
drivers/video/omap/lcd_mipid.c
fs/bio.c
fs/compat_ioctl.c
fs/notify/inotify/inotify_user.c
fs/reiserfs/fix_node.c
include/linux/in6.h
include/linux/sysctl.h
include/net/sctp/structs.h
include/net/tcp.h
include/net/wimax.h
kernel/time/clocksource.c
lib/Kconfig.debug
net/bluetooth/bnep/core.c
net/ipv4/netfilter/ipt_ECN.c
net/mac80211/mesh_pathtbl.c
net/sched/act_api.c
net/sctp/sm_sideeffect.c
net/sctp/sm_statefuns.c
sound/isa/cs423x/cs4236.c
sound/isa/opti9xx/miro.c
sound/isa/opti9xx/opti92x-ad1848.c
sound/oss/Kconfig
sound/pci/ca0106/ca0106_proc.c
sound/pci/emu10k1/emu10k1x.c
sound/pci/hda/patch_cirrus.c
sound/pci/hda/patch_cmedia.c
sound/pci/hda/patch_realtek.c
sound/pci/ice1712/juli.c
sound/soc/codecs/uda134x.c
sound/soc/codecs/wm8903.c
sound/soc/codecs/wm8993.c
sound/soc/s3c24xx/s3c24xx_simtec.c
sound/soc/s6000/s6000-pcm.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/bio.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge