James Morris ec98ce480a Merge branch 'master' into next ... Conflicts: fs/nfsd/nfs4recover.c Manually fixed above to use new creds API functions, e.g. nfs4_save_creds(). Signed-off-by: James Morris <jmorris@namei.org>		2008-12-04 17:16:36 +11:00
..
act2000	fix ! versus & precedence in various places	2008-02-06 10:40:59 -08:00
capi	CRED: Wrap task credential accesses in the ISDN drivers	2008-11-14 10:38:42 +11:00
divert	isdn: use non-racy method for proc entries creation	2008-04-29 08:06:22 -07:00
gigaset	tty: fix up gigaset a bit	2008-10-13 09:51:44 -07: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	CRED: Use creds in file structs	2008-11-14 10:39:25 +11:00
i4l	isdn: remove extra byteswap in isdn_net_ciscohdlck_slarp_send_reply	2008-11-16 23:03:45 -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