diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 19:05:37 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 19:05:37 +0400 |
| commit | c6538499814d8112c5d4d08570a7cf0758e5f8f5 (patch) | |
| tree | 3c3574d8aea838d91372765847577772092f09bc /include/media/v4l2-common.h | |
| parent | 662f11cf2aaedd3d5fe6afbec78ba3288fd0c4ca (diff) | |
| parent | cd17cbfda004fe5f406c01b318c6378d9895896f (diff) | |
| download | linux-c6538499814d8112c5d4d08570a7cf0758e5f8f5.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "mm: add /proc controls for pdflush threads"
viocd: needs to depend on BLOCK
block: fix the bio_vec array index out-of-bounds test
Diffstat (limited to 'include/media/v4l2-common.h')
0 files changed, 0 insertions, 0 deletions