lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4c1ac1b491
android_kernel_xiaomi_sm8350/drivers/isdn
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
act2000 WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
capi WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
divert Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
gigaset Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 2006-12-01 16:41:58 -08:00
hardware Fix misc .c/.h comment typos 2006-11-30 05:24:39 +01:00
hisax Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
hysdn [PATCH] drivers/isdn/hysdn/hysdn_sched.c: sleep after taking spinlock fix 2006-11-03 12:27:59 -08:00
i4l WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
icn [PATCH] ISDN: check for userspace copy faults 2006-10-17 08:18:49 -07:00
isdnloop [PATCH] ISDN: check for userspace copy faults 2006-10-17 08:18:49 -07:00
pcbit WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
sc [PATCH] ISDN: several minor fixes 2006-10-11 11:14:25 -07:00
Kconfig
Makefile