Merge branch 'master-fromSakari_v5' into devel
authorSergio Aguirre <saaguirre@ti.com>
Wed, 2 May 2012 14:41:32 +0000 (09:41 -0500)
committerSergio Aguirre <saaguirre@ti.com>
Wed, 2 May 2012 14:41:32 +0000 (09:41 -0500)
commit66fa9ed5ef699d7b135bcd861fe703f657c0f6a5
treec6cf6b2e4138cf1aa91cc07faa90e59efe9fbc05
parentf1f86597ddf28378f27037a32adaaf8c0084ced5
parentb52b6648391aa36e08002c262820efffbf9ed3e0
Merge branch 'master-fromSakari_v5' into devel
arch/arm/mach-omap2/Makefile
drivers/media/video/Kconfig
drivers/media/video/Makefile