linux_dsm_epyc7002/drivers/net/irda
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
..
act200l-sir.c drivers/net/*/: Use static const 2010-12-21 02:16:10 -08:00
actisys-sir.c
ali-ircc.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
ali-ircc.h
au1k_ir.c
au1000_ircc.h
bfin_sir.c net/irda: convert bfin_sir to common Blackfin UART header 2011-05-24 01:13:11 -04:00
bfin_sir.h net/irda: convert bfin_sir to common Blackfin UART header 2011-05-24 01:13:11 -04:00
donauboe.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
donauboe.h Fix common misspellings 2011-03-31 11:26:23 -03:00
ep7211-sir.c
esi-sir.c
girbil-sir.c Fix common misspellings 2011-03-31 11:26:23 -03:00
irda-usb.c Fix common misspellings 2011-03-31 11:26:23 -03:00
irda-usb.h
irtty-sir.c tiocmset: kill the file pointer argument 2011-02-17 11:52:43 -08:00
irtty-sir.h
Kconfig
kingsun-sir.c
ks959-sir.c
ksdazzle-sir.c
litelink-sir.c
ma600-sir.c
Makefile
mcp2120-sir.c
mcs7780.c Fix common misspellings 2011-03-31 11:26:23 -03:00
mcs7780.h
nsc-ircc.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
nsc-ircc.h Fix common misspellings 2011-03-31 11:26:23 -03:00
old_belkin-sir.c
pxaficp_ir.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
sa1100_ir.c
sh_irda.c net/irda/sh_irda: return to RX mode when TX error 2011-01-18 16:13:51 -08:00
sh_sir.c SuperH IrDA: correct Baud rate error correction 2010-11-21 10:09:53 -08:00
sir_dev.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
sir_dongle.c
sir-dev.h
smsc-ircc2.c irda: fix smsc-ircc2 section mismatch warning 2011-06-21 20:32:53 -07:00
smsc-ircc2.h
smsc-sio.h
stir4200.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
tekram-sir.c
toim3232-sir.c treewide: transciever/transceiver spelling fixes 2011-06-24 11:20:14 +02:00
via-ircc.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
via-ircc.h drivers/net: Remove unnecessary semicolons 2011-06-05 14:33:40 -07:00
vlsi_ir.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
vlsi_ir.h Fix common misspellings 2011-03-31 11:26:23 -03:00
w83977af_ir.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
w83977af_ir.h
w83977af.h