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-01-30 14:00:03 -08:00
2012-01-30 14:00:03 -08:00
2012-02-13 14:42:02 -08:00
2012-02-10 10:09:58 -08:00
2012-05-02 11:48:07 -07:00
2012-01-30 14:00:03 -08:00
2012-01-30 14:00:03 -08:00