Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ...

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2010-03-08 16:55:37 +01:00

..

lmc

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

.gitignore

gitignore: misc files

2006-01-01 22:21:50 +01:00

c101.c

headers: Fix build after <linux/sched.h> removal

2009-10-13 10:20:16 -07:00

cosa.c

Coding style correction of some wan drivers

2010-02-04 11:55:46 +01:00

cosa.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cycx_drv.c

drivers/net: replace __FUNCTION__ with __func__

2008-09-24 18:59:00 -04:00

cycx_main.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

cycx_x25.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

dlci.c

wan: Frame Relay/DLCI coding style corrections.

2009-11-29 23:42:14 -08:00

dscc4.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

farsync.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

farsync.h

WAN: farsync driver no longer uses syncppp.c directly

2008-07-23 23:00:38 +02:00

hd64570.c

wan: convert drivers to netdev_tx_t

2009-09-01 01:13:28 -07:00

hd64570.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hd64572.c

wan: convert drivers to netdev_tx_t

2009-09-01 01:13:28 -07:00

hd64572.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hdlc_cisco.c

Coding style correction of some wan drivers

2010-02-04 11:55:46 +01:00

hdlc_fr.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-12-09 19:43:33 -08:00

hdlc_ppp.c

drivers/net/wan: introduce missing kfree

2009-09-11 12:54:30 -07:00

hdlc_raw_eth.c

wan: convert drivers to netdev_tx_t

2009-09-01 01:13:28 -07:00

hdlc_raw.c

net: replace uses of __constant_{endian}

2009-02-01 00:45:17 -08:00

hdlc_x25.c

Coding style correction of some wan drivers

2010-02-04 11:55:46 +01:00

hdlc.c

net: use net_eq to compare nets

2009-11-25 15:14:13 -08:00

hostess_sv11.c

drivers/net: request_irq - Remove unnecessary leading & from second arg

2009-11-18 23:29:17 -08:00

ixp4xx_hss.c

IXP42x HSS support for setting internal clock rate

2009-09-07 01:56:49 -07:00

Kconfig

WAN: Add IXP4xx HSS HDLC driver.

2008-12-22 00:47:31 +01:00

lapbether.c

wan: convert drivers to netdev_tx_t

2009-09-01 01:13:28 -07:00

Makefile

WAN: Add IXP4xx HSS HDLC driver.

2008-12-22 00:47:31 +01:00

n2.c

drivers/net: request_irq - Remove unnecessary leading & from second arg

2009-11-18 23:29:17 -08:00

pc300_drv.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

pc300_tty.c

drivers/net: replace __FUNCTION__ with __func__

2008-09-24 18:59:00 -04:00

pc300-falc-lh.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

pc300.h

WAN: Convert PC300 driver to use normal u8/u16/u32 types

2008-07-23 23:00:38 +02:00

pc300too.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

pci200syn.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

sbni.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

sbni.h

sbni endian fixes

2008-01-18 14:44:33 -05:00

sdla.c

drivers/net: request_irq - Remove unnecessary leading & from second arg

2009-11-18 23:29:17 -08:00

sealevel.c

net: Coding style corrections on Sealevel Systems 4021 driver.

2009-12-02 01:26:01 -08:00

wanxl.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

wanxl.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

wanxlfw.inc_shipped

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

wanxlfw.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

x25_asy.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

x25_asy.h

x25_asy: convert to internal net_device_stats

2009-03-21 22:37:57 -07:00

z85230.c

wan: convert drivers to netdev_tx_t

2009-09-01 01:13:28 -07:00

z85230.h

wan: convert drivers to netdev_tx_t

2009-09-01 01:13:28 -07:00