Merge branch 'master' into devel
authorSergio Aguirre <saaguirre@ti.com>
Wed, 25 May 2011 00:29:34 +0000 (19:29 -0500)
committerSergio Aguirre <saaguirre@ti.com>
Wed, 25 May 2011 00:29:34 +0000 (19:29 -0500)
commit79e13cefda7df5934aa0ab5dd10b5c03b1364bf3
tree5b21decb8b3c30211aeef5be1ddf41f72b17539b
parente8e9ca1dd6ec472145071eda2340ff0ce926b71f
parent61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf
Merge branch 'master' into devel
drivers/media/video/soc_camera.c