2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 15:13:55 +08:00
linux-next/drivers/net/wireless/rtlwifi/rtl8192ce
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
..
def.h rtlwifi: rtl8192ce: Change hw routine for addition of rtl8192se and rtl8192de 2011-04-26 16:13:33 -04:00
dm.c rtlwifi: rtl8192ce: Change sw and LED routines for addition of rtl8192se and rtl8192de 2011-04-26 16:14:55 -04:00
dm.h rtlwifi: rtl8192ce: Change sw and LED routines for addition of rtl8192se and rtl8192de 2011-04-26 16:14:55 -04:00
hw.c wireless: rtlwifi: throw away MAC_FMT and use %pM instead 2011-07-20 15:04:38 -04:00
hw.h rtlwifi: rtl8192ce: Change hw routine for addition of rtl8192se and rtl8192de 2011-04-26 16:13:33 -04:00
led.c rtlwifi: rtl8192{c,ce,cu,se}: Remove comparisons of booleans with true 2011-06-20 15:47:43 -04:00
led.h rtlwifi: rtl8192ce: Change sw and LED routines for addition of rtl8192se and rtl8192de 2011-04-26 16:14:55 -04:00
Makefile rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig build 2011-02-23 16:28:41 -05:00
phy.c rtlwifi: Don't block interrupts in spinlocks 2011-06-03 15:01:05 -04:00
phy.h rtlwifi: rtl8192c-common: rtl8192ce: Fix for HT40 regression 2011-05-16 14:25:30 -04:00
reg.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
rf.c rtlwifi: rtl8192{c,ce,cu,se}: Remove comparisons of booleans with true 2011-06-20 15:47:43 -04:00
rf.h rtlwifi: rtl8192ce: Change phy and rc routines for addition of rtl8192se and rtl8192de 2011-04-26 16:14:55 -04:00
sw.c rtlwifi: rtl8192c-common: rtl8192ce: Fix for HT40 regression 2011-05-16 14:25:30 -04:00
sw.h rtlwifi: rtl8192ce: Change sw and LED routines for addition of rtl8192se and rtl8192de 2011-04-26 16:14:55 -04:00
table.c rtl8192ce: drop 'rtl8192c-' prefix from files 2010-12-20 14:49:47 -05:00
table.h rtl8192ce: drop 'rtl8192c-' prefix from files 2010-12-20 14:49:47 -05:00
trx.c rtlwifi: rtl8192{c,ce,cu,se}: Remove comparisons of booleans with true 2011-06-20 15:47:43 -04:00
trx.h rtlwifi: rtl8192ce: Change rtl8192ce routines phy and trx and modify rtl8192cu for addition of rtl8192se and rtl8192de 2011-04-26 16:14:55 -04:00