2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 07:34:06 +08:00
linux-next/drivers/net/wireless/rtlwifi
Linus Torvalds d3ec4844d4 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: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
rtl8192c rtlwifi: Convert printks to pr_<level> 2011-07-21 14:52:05 -04:00
rtl8192ce Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
rtl8192cu rtlwifi: Convert printks to pr_<level> 2011-07-21 14:52:05 -04:00
rtl8192de rtlwifi: Convert printks to pr_<level> 2011-07-21 14:52:05 -04:00
rtl8192se rtlwifi: Convert printks to pr_<level> 2011-07-21 14:52:05 -04:00
base.c rtlwifi: Convert printks to pr_<level> 2011-07-21 14:52:05 -04:00
base.h rtlwifi: Change base routines for addition of rtl8192se and rtl8192de 2011-04-26 16:13:31 -04:00
cam.c rtlwifi: Convert printks to pr_<level> 2011-07-21 14:52:05 -04:00
cam.h rtlwifi: Change cam routines for addition of rtl8192se and rtl8192de 2011-04-26 16:13:31 -04:00
core.c wireless: rtlwifi: throw away MAC_FMT and use %pM instead 2011-07-20 15:04:38 -04:00
core.h rtlwifi: include mac80211.h from core.h 2011-06-20 15:16:32 -04:00
debug.c
debug.h wireless: rtlwifi: throw away MAC_FMT and use %pM instead 2011-07-20 15:04:38 -04:00
efuse.c rtlwifi: rtl8192{c,ce,cu,se}: Remove comparisons of booleans with true 2011-06-20 15:47:43 -04:00
efuse.h rtlwifi: Change efuse routines addition of RTL8192SE and RTL8192DE 2011-04-26 16:13:31 -04:00
Kconfig rtlwifi: rtl8192de: Modify Kconfig and Makefile routines for new driver 2011-06-27 15:09:38 -04:00
Makefile rtlwifi: rtl8192de: Modify Kconfig and Makefile routines for new driver 2011-06-27 15:09:38 -04:00
pci.c rtlwifi: rtl8192{ce,cu,se} Remove irq_enabled 2011-07-05 15:26:54 -04:00
pci.h rtlwifi: rtl8192{ce,cu,se} Remove irq_enabled 2011-07-05 15:26:54 -04:00
ps.c rtlwifi: rtl8192{c,ce,cu,se}: Remove comparisons of booleans with true 2011-06-20 15:47:43 -04:00
ps.h rtlwifi: rtl8192cu: Remove unused parameter 2011-06-20 15:47:43 -04:00
rc.c rtlwifi: rtl8192{c,ce,cu,se}: Remove comparisons of booleans with true 2011-06-20 15:47:43 -04:00
rc.h rtlwifi: Convert rc routines for addition of rtl8192se and rtl8192de 2011-04-26 16:13:32 -04:00
regd.c rtlwifi: Fix warnings from gcc 4.6.0 2011-06-01 15:12:29 -04:00
regd.h rtlwifi: Convert regulatory domain routines for addition of rtl8192se and rtl8192de 2011-04-26 16:13:32 -04:00
usb.c rtlwifi: Convert printks to pr_<level> 2011-07-21 14:52:05 -04:00
usb.h rtlwifi: Change base routines for addition of rtl8192se and rtl8192de 2011-04-26 16:13:31 -04:00
wifi.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2011-06-30 13:34:06 -04:00