diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 22:31:56 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 22:31:56 +0200 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /drivers/media/video/cx18/cx18-av-firmware.c | |
| parent | Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100'... (diff) | |
| parent | [ARM] Improve non-executable support (diff) | |
| download | linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.xz linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.zip | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'drivers/media/video/cx18/cx18-av-firmware.c')
0 files changed, 0 insertions, 0 deletions