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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-sta.c

2008-12-05 22:54:40 -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

b1isa: fix b1isa_exit() to really remove registered capi controllers

2008-12-03 20:57:19 -08:00

hisax

tricky one: hisax sections

2008-11-30 10:03:37 -08:00

hysdn

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

2008-12-05 22:54:40 -08:00

i4l

isdn: Kill directly reference of netdev->priv

2008-12-03 15:49:46 -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

drivers/isdn/mISDN: use ARRAY_SIZE

2008-12-03 20:59:57 -08: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