linux/drivers/net/wimax/i2400m
Linus Torvalds 98793265b4 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: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
2012-01-08 13:21:22 -08:00
..
Kconfig
Makefile
control.c drivers/net: Add moduleparam.h to drivers as required. 2011-10-31 19:31:09 -04:00
debug-levels.h
debugfs.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
driver.c Fix common misspellings 2011-03-31 11:26:23 -03:00
fw.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
i2400m-sdio.h wimax: make functions local 2010-10-05 00:47:38 -07:00
i2400m-usb.h Fix common misspellings 2011-03-31 11:26:23 -03:00
i2400m.h treewide: Fix typos in various parts of the kernel, and fix some comments. 2011-12-02 14:57:31 +01:00
netdev.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
op-rfkill.c Fix common misspellings 2011-03-31 11:26:23 -03:00
rx.c drivers/net: Add moduleparam.h to drivers as required. 2011-10-31 19:31:09 -04:00
sdio-debug-levels.h
sdio-fw.c
sdio-rx.c wimax: make functions local 2010-10-05 00:47:38 -07:00
sdio-tx.c wimax/i2400m: add the error recovery mechanism on TX path 2010-05-11 14:05:39 -07:00
sdio.c drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
sysfs.c
tx.c net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
usb-debug-levels.h
usb-fw.c Fix common misspellings 2011-03-31 11:26:23 -03:00
usb-notif.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
usb-rx.c Fix common misspellings 2011-03-31 11:26:23 -03:00
usb-tx.c wimax/i2400m: remove an unused variable 2011-12-16 15:57:03 -05:00
usb.c drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00