David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/sfc/rx.c Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change the rx_buf->is_page boolean into a set of u16 flags, and another to adjust how ->ip_summed is initialized. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-02-26 21:55:51 -05: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	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
ambassador.h	ATM: Delete no use FILL_RX_POOLS_IN_BH marco	2011-07-08 09:06:31 -07:00
atmtcp.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
eni.c	net: add skb frag size accessors	2011-10-19 03:10:46 -04:00
eni.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
firestream.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
firestream.h
fore200e.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
fore200e.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
he.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
he.h	atm: [he] rewrite buffer handling in receive path	2010-05-31 00:27:47 -07:00
horizon.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
horizon.h	long vs. unsigned long - low-hanging fruits in drivers	2007-10-14 12:41:51 -07:00
idt77105.c	atm: idt77105: fix fetch_stats() result	2011-01-21 16:24:23 -08:00
idt77105.h	[ATM]: [idt77105] should be __devinit not __init	2006-06-29 16:58:12 -07:00
idt77252_tables.h
idt77252.c	Merge branch 'master' into for-next	2011-09-15 15:08:18 +02:00
idt77252.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
iphase.c	atm: eliminate atm_guess_pdu2truesize()	2011-11-26 16:40:30 -05:00
iphase.h	atm/iphase : removal of PCI space dereferences.	2011-10-03 14:09:10 -04:00
Kconfig	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
lanai.c	atm: Fix typo in lanai.c	2012-02-01 14:46:25 -05:00
Makefile	Drivers: atm: Makefile: replace the use of <module>-objs with <module>-y	2010-10-21 03:09:48 -07:00
midway.h
nicstar.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07: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	drivers/atm/solos-pci.c: exchange pci_iounmaps	2012-02-19 18:57:51 -05:00
suni.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
suni.h	atm: [suni] add support for setting loopback and framing modes	2008-06-17 16:19:24 -07:00
tonga.h
uPD98401.h
uPD98402.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
uPD98402.h
zatm.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
zatm.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
zeprom.h