diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 17:24:33 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 17:24:33 +0400 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /drivers/media/video/m5mols/m5mols.h | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
| download | linux-2e0e943436912ffe0848ece58167edfe754edb96.tar.xz | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'drivers/media/video/m5mols/m5mols.h')
0 files changed, 0 insertions, 0 deletions