Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 16 Feb 2012 13:23:50 +0000 (14:23 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 16 Feb 2012 13:23:50 +0000 (14:23 +0100)
1  2 
sys/v4l2/v4l2_calls.c

Simple merge