David S. Miller aa2ba5f108 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ixgbe/ixgbe_main.c drivers/net/smc91x.c		2008-12-02 19:50:27 -08:00
..
act2000	fix ! versus & precedence in various places	2008-02-06 10:40:59 -08:00
capi	device create: misc: convert device_create_drvdata to device_create	2008-10-16 09:24:43 -07:00
divert	isdn: use non-racy method for proc entries creation	2008-04-29 08:06:22 -07:00
gigaset	gigaset: get rid of info() and warn() macros	2008-11-29 21:38:28 -08:00
hardware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
hisax	tricky one: hisax sections	2008-11-30 10:03:37 -08:00
hysdn	hysdn: remove the packed attribute from PofTimStamp_tag	2008-07-30 16:48:05 -07:00
i4l	isdn: isdn_net.c annotate struct ip_ports and trivial sparse fixes	2008-11-20 04:10:51 -08:00
icn	fix ! versus & precedence in various places	2008-02-06 10:40:59 -08:00
isdnloop	drivers/isdn: correct use of ! and &	2008-03-04 16:35:16 -08:00
mISDN	mISDN/dsp_cmx.c: fix size checks	2008-10-13 18:42:55 -07:00
pcbit	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
sc	drivers/isdn/sc/ioctl.c: add missing kfree	2008-06-12 18:05:41 -07:00
Kconfig	Add mISDN driver	2008-07-27 01:46:33 +02:00
Makefile	mISDN fix main ISDN Makefile	2008-08-02 16:28:20 +02:00