Greg Kroah-Hartman 3eb9992caf Merge 3.15-rc2 into staging-next ... This resolves a bunch of merge errors with other fixes that are already in Linus's tree. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-04-22 10:08:40 -07:00
..
Kconfig	staging: vme: Fix URL in Kconfig	2013-01-07 14:56:04 -08:00
Makefile	Driver for GE PIO2 VME Card	2011-11-26 17:25:38 -08:00
vme_pio2.h	staging: vme: remove use of __devinit	2012-11-21 15:05:00 -08:00
vme_pio2_cntr.c	Staging: VME: move VME drivers out of staging	2012-04-26 12:34:58 -07:00
vme_pio2_core.c	staging: Remove unnecessary OOM messages	2013-02-11 10:10:33 -08:00
vme_pio2_gpio.c	staging: Remove unnecessary OOM messages	2013-02-11 10:10:33 -08:00
vme_user.c	Merge 3.15-rc2 into staging-next	2014-04-22 10:08:40 -07:00
vme_user.h	vme_user: Use __u64 and __u32 in userspace structs	2013-12-18 16:20:13 -08:00