FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-21 08:53:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
c74cba610c
linux/drivers/staging/vme
History
Greg Kroah-Hartman c8d1a12692 Merge staging-next tree into Linus's latest version 
Conflicts:
	drivers/staging/arlan/arlan-main.c
	drivers/staging/comedi/drivers/cb_das16_cs.c
	drivers/staging/cx25821/cx25821-alsa.c
	drivers/staging/dt3155/dt3155_drv.c
	drivers/staging/hv/hv.c
	drivers/staging/netwave/netwave_cs.c
	drivers/staging/wavelan/wavelan.c
	drivers/staging/wavelan/wavelan_cs.c
	drivers/staging/wlags49_h2/wl_cs.c

This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-21 12:48:55 -07:00
..
boards Staging: remove unused #include <linux/version.h> 2010-05-11 11:35:36 -07:00
bridges Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
devices Staging: push down BKL into ioctl functions 2010-05-11 11:35:36 -07:00
Kconfig Staging: vme: VMIVME-7805 board support 2010-03-03 16:43:02 -08:00
Makefile Staging: vme: VMIVME-7805 board support 2010-03-03 16:43:02 -08:00
TODO Staging: vme: Add ca91cx42 rmw support 2010-03-03 16:43:01 -08:00
vme_api.txt Staging: vme: Attribute Testing For Dma Request 2010-03-03 16:43:00 -08:00
vme_bridge.h Staging: vme: Remove legacy unsupported code 2010-03-03 16:43:01 -08:00
vme.c Staging: vme: declare vme_calc_slot() as static 2010-05-11 11:35:53 -07:00
vme.h Staging: vme: Attribute Testing For Dma Request 2010-03-03 16:43:00 -08:00