linux-stable/drivers/net/wireless/rtlwifi
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
..
rtl8192c rtl8192c: Do not log firmware load message unless actually done 2011-12-06 16:05:25 -05:00
rtl8192ce net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
rtl8192cu Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
rtl8192de Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
rtl8192se net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
base.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-01-03 15:16:34 -05:00
base.h rtlwifi: rtl8192cu: Fix endianian issues 2011-11-21 16:20:46 -05:00
cam.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
cam.h
core.c mac80211: pass vif param to conf_tx() callback 2011-10-03 15:22:41 -04:00
core.h
debug.c rtlwifi: Change debug parameter to apply to individual drivers 2011-10-11 16:41:22 -04:00
debug.h
efuse.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
efuse.h
Kconfig um: a couple of missing dependencies... 2011-11-02 14:15:28 +01:00
Makefile
pci.c net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
pci.h rtlwifi: Change PCI drivers to use the new PM framework 2011-10-14 14:48:14 -04:00
ps.c rtlwifi: Fix locking problem introduces with commit 6539306b 2011-12-19 14:40:48 -05:00
ps.h
rc.c
rc.h
regd.c
regd.h
usb.c rtlwifi: squash warning in _usb_read_sync 2011-11-22 14:41:22 -05:00
usb.h
wifi.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-01-03 15:16:34 -05:00