linux/drivers/staging/vme/devices
Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next
This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-02 11:48:07 -07:00
..
Kconfig Staging: VME: move VME drivers out of staging 2012-04-26 12:34:58 -07:00
Makefile Driver for GE PIO2 VME Card 2011-11-26 17:25:38 -08:00
vme_pio2.h staging: vme: fix section mismatches in linux-next 20120314 2012-03-15 14:04:34 -07: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 Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
vme_pio2_gpio.c Staging: VME: move VME drivers out of staging 2012-04-26 12:34:58 -07:00
vme_user.c Staging: VME: move VME drivers out of staging 2012-04-26 12:34:58 -07:00
vme_user.h Staging: VME: Remove typedefs 2011-12-01 10:28:00 -08:00