f341dddf1d
There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| go7007-driver.c | ||
| go7007-fw.c | ||
| go7007-i2c.c | ||
| go7007-priv.h | ||
| go7007-usb.c | ||
| go7007-v4l2.c | ||
| go7007.h | ||
| go7007.txt | ||
| Kconfig | ||
| Makefile | ||
| README | ||
| s2250-board.c | ||
| s2250-loader.c | ||
| s2250-loader.h | ||
| saa7134-go7007.c | ||
| snd-go7007.c | ||
| wis-i2c.h | ||
| wis-ov7640.c | ||
| wis-saa7113.c | ||
| wis-saa7115.c | ||
| wis-sony-tuner.c | ||
| wis-tw2804.c | ||
| wis-tw9903.c | ||
| wis-uda1342.c | ||
Todo: - checkpatch.pl cleanups - sparse cleanups - lots of little modules, should be merged together and added to the build. - testing? - handle churn in v4l layer. Please send patchs to Greg Kroah-Hartman <greg@kroah.com> and Cc: Ross Cohen <rcohen@snurgle.org> as well.