android_kernel_xiaomi_sm8350/include
David S. Miller 4dd565134e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/netdev.c
2008-10-08 14:56:41 -07:00
..
acpi
asm-arm
asm-cris
asm-frv
asm-generic warn: Turn the netdev timeout WARN_ON() into a WARN() 2008-09-16 19:39:33 -07:00
asm-m32r
asm-m68k
asm-mips [MIPS] IP27: Fix build errors if CONFIG_MAPPED_KERNEL=y 2008-10-06 01:22:29 +01:00
asm-mn10300
asm-parisc lib: Correct printk %pF to work on all architectures 2008-09-09 11:51:15 -07:00
asm-um net: Fix build with ARCH=um 2008-09-19 12:44:54 -07:00
asm-x86 inotify: fix lock ordering wrt do_page_fault's mmap_sem 2008-10-02 15:53:13 -07:00
asm-xtensa
crypto
drm
keys
linux Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-10-08 14:56:41 -07:00
math-emu
media
mtd
net sctp: shrink sctp_tsnmap some more by removing gabs array 2008-10-08 14:19:01 -07:00
pcmcia
rdma
rxrpc
scsi [SCSI] fix check of PQ and PDT bits for WLUNs 2008-08-29 09:19:11 -05:00
sound
video
xen
Kbuild