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
..
as102	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
cxd2099
dt3155v4l	[media] Staging: dt3155v4l: probe() always fails	2012-01-06 11:06:53 -02:00
easycap	Staging: media: easycap: remove err() usage	2012-04-23 17:13:54 -07:00
go7007	Staging: media: go7007: use module_usb_driver()	2012-04-23 16:33:52 -07:00
lirc	Staging: media: lirc: lirc_ttusbir: remove err() usage	2012-04-24 09:03:48 -07:00
solo6x10	[media] Staging: media: solo6x10: core.c Fix some coding style issue	2012-03-19 15:44:00 -03:00
Kconfig	[media] staging: Fix comments and some typos in staging/media/*	2012-03-19 14:26:16 -03:00
Makefile