diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 09:21:41 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 09:21:41 +0100 |
| commit | 7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902 (patch) | |
| tree | c76aeb5996fa8f39b838e9cc41f40f854db01912 /include/media/v4l2-mem2mem.h | |
| parent | 695884fb8acd9857e0e7120ccb2150e30f4b8fef (diff) | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) | |
| download | kernel_samsung_tuna-7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902.zip kernel_samsung_tuna-7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902.tar.gz kernel_samsung_tuna-7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902.tar.bz2 | |
Merge branch 'linus' into x86/platform
Reason: Import mainline device tree changes on which further patches
depend on or conflict.
Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/media/v4l2-mem2mem.h')
0 files changed, 0 insertions, 0 deletions