OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/net/irda
History
Linus Torvalds d6748066ad 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: (37 commits)
  MIPS: O32: Provide definition of registers ta0 .. ta3.
  MIPS: perf: Add Octeon support for hardware perf.
  MIPS: perf: Add support for 64-bit perf counters.
  MIPS: perf: Reorganize contents of perf support files.
  MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
  MIPS: Add accessor macros for 64-bit performance counter registers.
  MIPS: Add probes for more Octeon II CPUs.
  MIPS: Add more CPU identifiers for Octeon II CPUs.
  MIPS: XLR, XLS: Add comment for smp setup
  MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
  MIPS: JZ4740: GPIO: Simplify IRQ demuxer
  MIPS: JZ4740: Use generic irq chip
  MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
  MIPS: Alchemy: kill au1xxx.h header
  MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
  MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
  MIPS: Alchemy: Redo PCI as platform driver
  MIPS: Alchemy: more base address cleanup
  MIPS: Alchemy: rewrite USB platform setup.
  MIPS: Alchemy: abstract USB block control register access
  ...

Fix up trivial conflicts in:
	arch/mips/alchemy/devboards/db1x00/platform.c
	drivers/ide/Kconfig
	drivers/mmc/host/au1xmmc.c
	drivers/video/Kconfig
	sound/mips/Kconfig
 		2011-11-03 13:28:14 -07:00
..
Kconfig Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
Makefile net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -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 net: trans_start cleanups 2010-05-10 05:01:31 -07:00
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 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
…
kingsun-sir.c headers: kref.h redux 2009-09-26 10:17:19 -07:00
ks959-sir.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
ksdazzle-sir.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
litelink-sir.c
…
ma600-sir.c
…
mcp2120-sir.c
…
mcs7780.c Fix common misspellings 2011-03-31 11:26:23 -03:00
mcs7780.h irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
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 net: trans_start cleanups 2010-05-10 05:01:31 -07:00
sh_irda.c net/irda: sh_irda: add PM support 2011-09-15 17:19:28 -04:00
sh_sir.c net/irda: sh_sir: tidyup compile warning 2011-08-11 05:52:57 -07: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 irda: use PCI_VENDOR_ID_* 2011-08-03 19:04:11 -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.h
…
w83977af_ir.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
w83977af_ir.h
…