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

Conflicts:
	drivers/net/sfc/net_driver.h
	drivers/net/sfc/siena.c

2010-06-06 17:42:02 -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

isdn/kcapi: return -EFAULT on copy_from_user errors

2010-06-03 03:28:22 -07:00

divert

Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing

2010-05-19 17:23:28 -07:00

gigaset

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2010-05-25 16:59:51 -07:00

hardware

drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held

2010-06-01 00:26:06 -07:00

hisax

Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

2010-05-21 17:15:44 -07:00

hysdn

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

i4l

drivers/isdn: Use memdup_user

2010-05-31 00:24:15 -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

mISDN: remove unnecessary test on f_pos

2010-05-27 09:12:56 -07:00

pcbit

drivers/isdn: Use memdup_user

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

sc

drivers/isdn: Use memdup_user

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

Kconfig

isdn: fix a few Kconfig imperfections

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

Makefile

…