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
..
acpi	IOMMU Upates for Linux v3.15	2014-04-05 18:46:26 -07:00
asm-generic	asm-generic: remove _STK_LIM_MAX	2014-05-15 00:32:09 +01:00
clocksource
crypto
drm	Merge branch 'mullins' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes	2014-05-07 09:10:28 +10:00
dt-bindings	3.15 fixes for AT91	2014-04-26 11:29:30 +02:00
keys
kvm
linux	Merge 3.15-rc6 into staging-next.	2014-05-22 23:27:17 +09:00
math-emu
media	[media] rc-core: remove generic scancode filter	2014-04-06 11:30:29 -03:00
memory
misc
net	vsock: Make transport the proto owner	2014-05-05 13:13:50 -04:00
pcmcia
ras
rdma	Merge branches 'core', 'cxgb4', 'ip-roce', 'iser', 'misc', 'mlx4', 'nes', 'ocrdma', 'qib', 'sgwrapper', 'srp' and 'usnic' into for-next	2014-04-03 08:30:17 -07:00
rxrpc
scsi	scsi: Make sure cmd_flags are 64-bit	2014-04-09 20:26:20 -06:00
sound	ALSA: cs8427: separate HW initialization	2014-04-03 14:59:48 +02:00
target	target/sbc: Add sbc_dif_read_strip software emulation	2014-04-07 01:48:57 -07:00
trace	This contains two fixes.	2014-05-08 14:17:13 -07:00
uapi	asm-generic: Add renameat2 syscall	2014-05-20 10:59:38 +02:00
video	fbdev changes for 3.15 (OMAP)	2014-04-07 10:47:51 -07:00
xen
Kbuild