David S. Miller b4aa9e05a6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/bnx2x/bnx2x.h
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/vhost/vhost.c

2010-12-17 12:27:22 -08:00

..

.gitignore

[ATM]: Ignore generated file pca200e_ecd.bin2

2006-12-11 14:34:35 -08:00

adummy.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

ambassador.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

ambassador.h

firmware: convert Ambassador ATM driver to request_firmware()

2008-07-10 14:49:39 +01:00

atmtcp.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

eni.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

eni.h

drivers/atm/eni.h: remove unused macro KERNEL_OFFSET

2008-06-10 12:46:52 -07:00

firestream.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

firestream.h

Linux-2.6.12-rc2

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

fore200e.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-17 12:27:22 -08:00

fore200e.h

fore200e: Convert over to pure OF driver.

2008-08-29 02:14:59 -07:00

he.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

he.h

atm: [he] rewrite buffer handling in receive path

2010-05-31 00:27:47 -07:00

horizon.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

horizon.h

long vs. unsigned long - low-hanging fruits in drivers

2007-10-14 12:41:51 -07:00

idt77105.c

atm/idt77105.c: call atm_dev_signal_change() when signal changes.

2010-07-09 00:09:22 -07:00

idt77105.h

[ATM]: [idt77105] should be __devinit not __init

2006-06-29 16:58:12 -07:00

idt77252_tables.h

Linux-2.6.12-rc2

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

idt77252.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

idt77252.h

atm: idt77252: Use generic SKB queue management instead of home-grown scheme.

2008-09-21 21:38:26 -07:00

iphase.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

iphase.h

ATM: iphase, remove sleep-inside-atomic

2010-10-11 11:05:42 -07:00

Kconfig

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

lanai.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-17 12:27:22 -08:00

Makefile

Drivers: atm: Makefile: replace the use of <module>-objs with <module>-y

2010-10-21 03:09:48 -07:00

midway.h

Linux-2.6.12-rc2

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

nicstar.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

nicstar.h

atm: [nicstar] remove virt_to_bus() and support 64-bit platforms

2010-05-31 00:27:46 -07:00

nicstarmac.c

atm: [nicstar] reformatted with Lindent

2010-05-31 00:27:46 -07:00

nicstarmac.copyright

drivers/atm/: remove CVS keywords

2008-05-20 14:52:25 -07:00

solos-attrlist.c

solos: Add 'Firmware' attribute for Traverse overall firmware version

2010-11-08 12:17:04 -08:00

solos-pci.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

suni.c

atm/suni.c: call atm_dev_signal_change() when signal changes.

2010-07-09 00:09:23 -07:00

suni.h

atm: [suni] add support for setting loopback and framing modes

2008-06-17 16:19:24 -07:00

tonga.h

Linux-2.6.12-rc2

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

uPD98401.h

Linux-2.6.12-rc2

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

uPD98402.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

uPD98402.h

Linux-2.6.12-rc2

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

zatm.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

zatm.h

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

zeprom.h

Linux-2.6.12-rc2

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