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
..
2012-02-24 12:05:37 -08:00
2012-05-02 11:48:07 -07:00
2009-11-30 16:39:42 -08:00
2011-03-31 11:26:23 -03:00
2012-04-10 15:25:55 -07:00