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

	drivers/net/cpmac.c
	net/mac80211/mlme.c
2008-05-25 23:26:10 -07:00
..
acpi
asm-alpha asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace 2008-05-14 19:11:14 -07:00
asm-arm [ARM] pxa: Fix RCSR handling 2008-05-08 18:04:02 +01:00
asm-avr32
asm-blackfin Blackfin Serial Driver: abstract away DLAB differences into header 2008-05-07 11:41:26 +08:00
asm-cris
asm-frv read_barrier_depends arch fixlets 2008-05-14 10:05:18 -07:00
asm-generic
asm-h8300 asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace 2008-05-14 19:11:14 -07:00
asm-ia64
asm-m32r
asm-m68k m68k: remove old mac_esp cruft 2008-05-05 12:38:50 -07:00
asm-m68knommu
asm-mips [MIPS] Get rid of __ilog2 2008-05-12 16:46:55 +01:00
asm-mn10300 MN10300: Make cpu_relax() invoke barrier() 2008-05-08 10:49:39 -07:00
asm-parisc
asm-powerpc Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge 2008-05-09 20:12:06 +10:00
asm-ppc [POWERPC] ppc: More compile fixes 2008-05-12 22:57:51 +10:00
asm-s390 types: s390: fix #ifdef reversal in <asm-s390/types.h> 2008-05-12 08:49:59 -07:00
asm-sh sh: Fix DMAC base address for SH7709S 2008-05-09 19:04:12 +09:00
asm-sparc sparc: Fix mremap address range validation. 2008-05-12 16:33:33 -07:00
asm-sparc64 sparc64: Use a TS_RESTORE_SIGMASK 2008-05-12 22:45:15 -07:00
asm-um asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace 2008-05-14 19:11:14 -07:00
asm-v850 asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace 2008-05-14 19:11:14 -07:00
asm-x86 mprotect: prevent alteration of the PAT bits 2008-05-14 19:11:15 -07:00
asm-xtensa asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace 2008-05-14 19:11:14 -07:00
crypto
keys
linux Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-05-25 23:26:10 -07:00
math-emu
media i2c: Convert some more new-style drivers to use module aliasing 2008-05-11 20:37:06 +02:00
mtd
net Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-05-25 23:26:10 -07:00
pcmcia
rdma
rxrpc
scsi
sound [ALSA] ASoC: build fix for snd_soc_info_bool_ext 2008-05-13 14:47:44 +02:00
video
xen
Kbuild