Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 12:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
d896e0e4f4
linux/drivers/staging/vme
History
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
..
devices Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
Makefile Staging: VME: move VME drivers out of staging 2012-04-26 12:34:58 -07:00