github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-19 20:48:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
286fed412a
linux/drivers/net/irda
History
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
..
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 net: trans_start cleanups 2010-05-10 05:01:31 -07:00
au1000_ircc.h
bfin_sir.c net/irda: convert drivers/net/irda/* to use module_platform_driver() 2011-11-27 20:29:11 -05:00
bfin_sir.h net/irda: convert bfin_sir to common Blackfin UART header 2011-05-24 01:13:11 -04:00
donauboe.c module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05: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 USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
irda-usb.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
irtty-sir.c tiocmset: kill the file pointer argument 2011-02-17 11:52:43 -08:00
irtty-sir.h
Kconfig Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
kingsun-sir.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
ks959-sir.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
ksdazzle-sir.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
litelink-sir.c
ma600-sir.c
Makefile net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
mcp2120-sir.c
mcs7780.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
mcs7780.h
nsc-ircc.c treewide: Fix typos in various parts of the kernel, and fix some comments. 2011-12-02 14:57:31 +01:00
nsc-ircc.h Fix common misspellings 2011-03-31 11:26:23 -03:00
old_belkin-sir.c
pxaficp_ir.c net/irda: convert drivers/net/irda/* to use module_platform_driver() 2011-11-27 20:29:11 -05:00
sa1100_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
sh_irda.c net/irda: convert drivers/net/irda/* to use module_platform_driver() 2011-11-27 20:29:11 -05:00
sh_sir.c net/irda: convert drivers/net/irda/* to use module_platform_driver() 2011-11-27 20:29:11 -05: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 module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
smsc-ircc2.h
smsc-sio.h
stir4200.c Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 2012-01-08 13:10:57 -08:00
tekram-sir.c
toim3232-sir.c treewide: transciever/transceiver spelling fixes 2011-06-24 11:20:14 +02:00
via-ircc.c treewide: Fix typos in various parts of the kernel, and fix some comments. 2011-12-02 14:57:31 +01: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 treewide: Fix typos in various parts of the kernel, and fix some comments. 2011-12-02 14:57:31 +01:00
w83977af_ir.h
w83977af.h