linux/drivers/net/wireless/prism54
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
..
isl_38xx.c
isl_38xx.h
isl_ioctl.c drivers/net/wireless/prism54: Adjust confusing if indentation 2010-08-16 15:26:41 -04:00
isl_ioctl.h
isl_oid.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
islpci_dev.c drivers/net: remove useless semicolons 2010-05-17 22:47:34 -07:00
islpci_dev.h
islpci_eth.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
islpci_eth.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
islpci_hotplug.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
islpci_mgt.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2010-04-15 16:21:34 -04:00
islpci_mgt.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
Makefile
oid_mgt.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2010-04-15 16:21:34 -04:00
oid_mgt.h
prismcompat.h