Greg Kroah-Hartman 69c1f05379 Merge 3.15-rc6 into staging-next. ... This resolves the conflicts in the files: drivers/iio/adc/Kconfig drivers/staging/rtl8723au/os_dep/usb_ops_linux.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-05-22 23:27:17 +09:00
..
boot	asmlinkage, x86: Add explicit __visible to arch/x86/*	2014-05-05 16:07:44 -07:00
configs
crypto
ia32
include	x86, mm, hugetlb: Add missing TLB page invalidation for hugetlb_cow()	2014-05-13 16:34:09 -07:00
kernel	x86-64, modify_ldt: Make support for 16-bit segments a runtime option	2014-05-14 16:33:54 -07:00
kvm	asmlinkage, x86: Add explicit __visible to arch/x86/*	2014-05-05 16:07:44 -07:00
lguest	asmlinkage, x86: Add explicit __visible to arch/x86/*	2014-05-05 16:07:44 -07:00
lib	x86: Fix typo preventing msr_set/clear_bit from having an effect	2014-05-09 08:42:32 -07:00
math-emu	asmlinkage, x86: Add explicit __visible to arch/x86/*	2014-05-05 16:07:44 -07:00
mm
net
oprofile
pci
platform	asmlinkage, x86: Add explicit __visible to arch/x86/*	2014-05-05 16:07:44 -07:00
power	asmlinkage, x86: Add explicit __visible to arch/x86/*	2014-05-05 16:07:44 -07:00
realmode
syscalls	x86/build: Supress "Nothing to be done for ..." messages	2014-04-14 11:44:36 +02:00
tools	x86/build: Supress "Nothing to be done for ..." messages	2014-04-14 11:44:36 +02:00
um
vdso	x86-64, modify_ldt: Make support for 16-bit segments a runtime option	2014-05-14 16:33:54 -07:00
video
xen	asmlinkage, x86: Add explicit __visible to arch/x86/*	2014-05-05 16:07:44 -07:00
.gitignore
Kbuild
Kconfig	goldfish: Allow 64bit builds	2014-05-15 13:19:01 -07:00
Kconfig.cpu
Kconfig.debug
Makefile	x86-64, build: Fix stack protector Makefile breakage with 32-bit userland	2014-05-07 14:14:44 -07:00
Makefile_32.cpu
Makefile.um