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

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-21 13:38:42 -07:00

..

21142.c

tulip: Convert uses of KERN_DEBUG

2011-05-09 12:51:15 -07:00

de4x5.c

net: de4x5: Use helpers from linux/etherdevice.h

2011-07-04 20:27:28 -07:00

de4x5.h

de4x5: Remove developer debug feature about set/clear promisc

2008-07-22 16:09:09 -04:00

de2104x.c

net: remove interrupt.h inclusion from netdevice.h

2011-06-06 22:55:11 -07:00

dmfe.c

tulip: dmfe: Remove old log spamming pr_debugs

2011-07-18 10:44:44 -07:00

eeprom.c

tulip: Convert printks to netdev_<level>

2011-05-09 12:51:15 -07:00

interrupt.c

tulip: Convert uses of KERN_DEBUG

2011-05-09 12:51:15 -07:00

Kconfig

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

2010-10-24 13:41:39 -07:00

Makefile

tulip: Convert uses of KERN_DEBUG

2011-05-09 12:51:15 -07:00

media.c

tulip: Convert uses of KERN_DEBUG

2011-05-09 12:51:15 -07:00

pnic2.c

tulip: Convert uses of KERN_DEBUG

2011-05-09 12:51:15 -07:00

pnic.c

net: remove interrupt.h inclusion from netdevice.h

2011-06-06 22:55:11 -07:00

timer.c

tulip: Convert uses of KERN_DEBUG

2011-05-09 12:51:15 -07:00

tulip_core.c

net: remove interrupt.h inclusion from netdevice.h

2011-06-06 22:55:11 -07:00

tulip.h

tulip: Convert uses of KERN_DEBUG

2011-05-09 12:51:15 -07:00

uli526x.c

tulip: Use pr_<level> where appropriate

2011-05-09 12:51:16 -07:00

winbond-840.c

tulip: Use pr_<level> where appropriate

2011-05-09 12:51:16 -07:00

xircom_cb.c

tulip: Convert uses of KERN_DEBUG

2011-05-09 12:51:15 -07:00