linux/drivers/net/wireless/p54
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
..
eeprom.c drivers/net/wireless/p54/eeprom.c: Return -ENOMEM on memory allocation failure 2010-10-15 15:57:44 -04:00
eeprom.h
fwio.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 2010-08-24 16:35:40 -04:00
Kconfig Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
led.c drivers/net/wireless: Restore upper case words in wiphy_<level> messages 2010-08-18 16:37:44 -04:00
lmac.h
main.c mac80211: use cipher suite selectors 2010-08-16 16:45:11 -04:00
Makefile
net2280.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
p54.h p54: remove get_tx_stats() mac80211 op 2010-02-08 16:51:01 -05:00
p54pci.c drivers/net/wireless: Restore upper case words in wiphy_<level> messages 2010-08-18 16:37:44 -04:00
p54pci.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
p54spi_eeprom.h p54spi: fix eeprom checksum 2010-08-24 16:28:14 -04:00
p54spi.c p54spi: Add error message for eeprom failure 2010-09-07 13:54:34 -04:00
p54spi.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
p54usb.c p54usb: add five more USBIDs 2010-10-05 13:35:25 -04:00
p54usb.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
txrx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 2010-09-24 15:52:34 -04:00