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

Conflicts:
	include/linux/if_pppox.h

Fix conflict between Changli's __packed header file fixes and
the new PPTP driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2010-08-22 22:37:04 -07:00

..

act2000

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

capi

drivers: isdn: use kernel macros to convert hex digit

2010-07-15 19:05:24 -07:00

divert

isdn: autoconvert trivial BKL users to private mutex

2010-07-12 20:21:47 -07:00

gigaset

isdn: gigaset: use after free

2010-08-07 23:04:12 -07:00

hardware

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

2010-08-22 22:37:04 -07:00

hisax

drivers/isdn: Adjust confusing if indentation

2010-08-16 21:06:30 -07:00

hysdn

drivers: isdn: remove custom strtoul()

2010-07-15 19:05:25 -07:00

i4l

drivers/isdn: Remove unnecessary casts of private_data

2010-07-12 21:13:34 -07:00

icn

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

isdnloop

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

mISDN

drivers/isdn: Adjust confusing if indentation

2010-08-16 21:06:30 -07:00

pcbit

drivers/isdn: Use memdup_user

2010-05-31 00:24:15 -07:00

sc

isdn: fix information leak

2010-08-05 13:21:25 -07:00

Kconfig

isdn: fix a few Kconfig imperfections

2010-02-22 15:45:53 -08:00

Makefile

mISDN fix main ISDN Makefile

2008-08-02 16:28:20 +02:00