diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 23:24:51 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 23:24:51 +0200 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /drivers/media/video/pwc/pwc-ctrl.c | |
| parent | Merge branch 'omap-all' into devel (diff) | |
| parent | [ARM] S3C24XX: Additional include moves (diff) | |
| download | linux-7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4.tar.xz linux-7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4.zip | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/media/video/pwc/pwc-ctrl.c')
0 files changed, 0 insertions, 0 deletions