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
..
2011-10-24 16:52:39 +02:00
evm
2011-07-18 12:29:40 -04:00
2010-10-21 20:21:03 -04:00
2012-03-28 18:41:23 +01:00
2011-03-31 11:26:23 -03:00
2012-04-23 14:23:32 +03:00
2011-03-22 04:53:09 -03:00
2008-11-12 17:17:18 -08:00
2008-05-24 09:56:07 -07:00
2011-03-31 11:26:23 -03:00
2007-02-11 10:51:28 -08:00
2011-04-29 18:09:34 -07:00
2009-02-18 15:37:56 -08:00
2011-02-21 20:16:21 -05:00
2009-09-23 07:39:48 -07:00
2008-04-19 19:10:28 -07:00
2008-07-24 10:47:17 -07:00
2008-04-18 08:56:07 -07:00
2009-06-18 13:04:04 -07:00