mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity
linux-stable/drivers/net/irda
History
Linus Torvalds 4964e0664c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
  MIPS: Delete unused function add_temporary_entry.
  MIPS: Set default pci cache line size.
  MIPS: Flush huge TLB
  MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
  MIPS: Octeon: Add support for OCTEON II PCIe
  MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
  MIPS: Alchemy: Update cpu-feature-overrides
  MIPS: Alchemy: db1200: Improve PB1200 detection.
  MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
  MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
  MIPS: Alchemy: irq: register pm at irq init time
  MIPS: Alchemy: Touchscreen support on DB1100
  MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
  net/irda: convert au1k_ir to platform driver.
  MIPS: Alchemy: remove unused board headers
  MTD: nand: make au1550nd.c a platform_driver
  MIPS: Netlogic: Mark Netlogic chips as SMT capable
  MIPS: Netlogic: Add support for XLP 3XX cores
  MIPS: Netlogic: Merge some of XLR/XLP wakup code
  MIPS: Netlogic: Add default XLP config.
  ...

Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile
 		2012-01-14 13:05:21 -08:00
..
Kconfig net/irda: convert au1k_ir to platform driver. 2011-12-08 10:42:15 +00:00
Makefile
…
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/irda: convert au1k_ir to platform driver. 2011-12-08 10:42:15 +00:00
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
…
irtty-sir.c tiocmset: kill the file pointer argument 2011-02-17 11:52:43 -08:00
irtty-sir.h
…
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
…
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
…
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.h
…
sir_dev.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
sir_dongle.c
…
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.h
…
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
…