tmp_suning_uos_patched/drivers/isdn
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
act2000 Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
capi CAPI: Remove experimental tag from middleware feature 2010-02-16 16:01:36 -08:00
divert headers: remove sched.h from poll.h 2009-10-04 15:05:10 -07:00
gigaset isdn: remove ishexdigit() in regard to isxdigit() 2010-02-26 01:24:24 -08:00
hardware Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
hisax Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2010-02-28 19:23:06 -08:00
hysdn proc_fops: convert drivers/isdn/ to seq_file 2010-01-14 03:10:54 -08:00
i4l Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
icn Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
isdnloop
mISDN tree-wide: fix 'lenght' typo in comments and code 2010-02-05 12:22:45 +01:00
pcbit Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
sc tree-wide: fix typos "ammount" -> "amount" 2010-02-05 12:22:40 +01:00
Kconfig isdn: fix a few Kconfig imperfections 2010-02-22 15:45:53 -08:00
Makefile