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
..
devices	Merge 3.15-rc2 into staging-next	2014-04-22 10:08:40 -07:00
Makefile	Staging: VME: move VME drivers out of staging	2012-04-26 12:34:58 -07:00