original_kernel/drivers/infiniband/hw/qib
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
Kconfig
Makefile
qib.h
qib_6120_regs.h
qib_7220.h
qib_7220_regs.h
qib_7322_regs.h
qib_common.h
qib_cq.c
qib_diag.c
qib_dma.c
qib_driver.c
qib_eeprom.c
qib_file_ops.c
qib_fs.c
qib_iba6120.c
qib_iba7220.c
qib_iba7322.c
qib_init.c
qib_intr.c
qib_keys.c
qib_mad.c
qib_mad.h
qib_mmap.c
qib_mr.c
qib_pcie.c
qib_pio_copy.c
qib_qp.c
qib_qsfp.c
qib_qsfp.h
qib_rc.c
qib_ruc.c
qib_sd7220.c
qib_sdma.c
qib_srq.c
qib_sysfs.c
qib_twsi.c
qib_tx.c
qib_uc.c
qib_ud.c
qib_user_pages.c
qib_user_sdma.c
qib_user_sdma.h
qib_verbs.c
qib_verbs.h
qib_verbs_mcast.c
qib_wc_ppc64.c
qib_wc_x86_64.c