leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a319a2773a
linux/drivers/net/irda
History
Linus Torvalds a319a2773a Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
  net/ieee80211: fix more crypto-related build breakage
  [PATCH] Spidernet: add ethtool -S (show statistics)
  [NET] GT96100: Delete bitrotting ethernet driver
  [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
  [PATCH] Cirrus Logic ep93xx ethernet driver
  r8169: the MMIO region of the 8167 stands behin BAR#1
  e1000, ixgb: Remove pointless wrappers
  [PATCH] Remove powerpc specific parts of 3c509 driver
  [PATCH] s2io: Switch to pci_get_device
  [PATCH] gt96100: move to pci_get_device API
  [PATCH] ehea: bugfix for register access functions
  [PATCH] e1000 disable device on PCI error
  drivers/net/phy/fixed: #if 0 some incomplete code
  drivers/net: const-ify ethtool_ops declarations
  [PATCH] ethtool: allow const ethtool_ops
  [PATCH] sky2: big endian
  [PATCH] sky2: fiber support
  [PATCH] sky2: tx pause bug fix
  drivers/net: Trim trailing whitespace
  [PATCH] ehea: IBM eHEA Ethernet Device Driver
  ...

Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a3 that just happened to be
next to unrelated changes in this update.
2006-09-24 10:15:13 -07:00
..
act200l-sir.c
act200l.c
actisys-sir.c
actisys.c
ali-ircc.c [IRDA]: Replace hard-coded dev_self[] array sizes with ARRAY_SIZE() 2006-09-22 14:54:45 -07:00
ali-ircc.h
au1k_ir.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
au1000_ircc.h
donauboe.c [PATCH] irq-flags: drivers/net: Use the new IRQF_ constants 2006-07-02 13:58:51 -07:00
donauboe.h
ep7211_ir.c [IRDA]: sti/cli removal from EP7211 IrDA driver 2006-03-20 19:00:04 -08:00
esi-sir.c
esi.c
girbil-sir.c
girbil.c
irda-usb.c [PATCH] irda-usb printk fix 2006-06-25 10:01:24 -07:00
irda-usb.h [IRDA]: irda-usb.c: STIR421x cleanups 2006-06-17 21:30:26 -07:00
irport.c [IRDA]: Replace hard-coded dev_self[] array sizes with ARRAY_SIZE() 2006-09-22 14:54:45 -07:00
irport.h
irtty-sir.c [IRDA] sem2mutex: drivers/net/irda 2006-03-20 22:32:53 -08:00
irtty-sir.h
Kconfig [IrDA]: Fix the AU1000 FIR dependencies 2006-06-29 17:03:19 -07:00
litelink-sir.c
litelink.c
ma600-sir.c
ma600.c
Makefile [IRDA]: Initial support for MCS7780 based dongles 2006-06-17 21:26:18 -07:00
mcp2120-sir.c
mcp2120.c
mcs7780.c [PATCH] remove unnecessary config.h includes from drivers/net/ 2006-08-14 14:00:43 -04:00
mcs7780.h [IRDA]: Initial support for MCS7780 based dongles 2006-06-17 21:26:18 -07:00
nsc-ircc.c [IRDA]: add some IBM think pads 2006-06-26 00:02:47 -07:00
nsc-ircc.h [IRDA]: nsc-ircc: PM update 2006-03-20 18:59:05 -08:00
old_belkin-sir.c
old_belkin.c
pxaficp_ir.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sa1100_ir.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sir_dev.c [IRDA]: Switching to a workqueue for the SIR work 2006-05-09 15:27:04 -07:00
sir_dongle.c [IRDA] sem2mutex: drivers/net/irda 2006-03-20 22:32:53 -08:00
sir-dev.h [IRDA]: Switching to a workqueue for the SIR work 2006-05-09 15:27:04 -07:00
smsc-ircc2.c [PATCH] smsc-ircc2: fix section reference mismatches 2006-07-12 17:42:40 -04:00
smsc-ircc2.h
smsc-sio.h
stir4200.c [IRDA]: stir4200, switching to the kthread API 2006-06-17 21:26:20 -07:00
tekram-sir.c
tekram.c
toim3232-sir.c [IRDA]: remove MODULE_PARM() 2006-03-20 22:33:41 -08:00
via-ircc.c [IRDA]: Replace hard-coded dev_self[] array sizes with ARRAY_SIZE() 2006-09-22 14:54:45 -07:00
via-ircc.h
vlsi_ir.c [PATCH] irq-flags: drivers/net: Use the new IRQF_ constants 2006-07-02 13:58:51 -07:00
vlsi_ir.h
w83977af_ir.c Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 2006-09-24 10:15:13 -07:00
w83977af_ir.h
w83977af.h