diff options
author | Patrick McHardy <kaber@trash.net> | 2011-01-14 14:12:37 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 14:12:37 +0100 |
commit | 0134e89c7bcc9fde1da962c82a120691e185619f (patch) | |
tree | 3e03335cf001019a2687d161e956de4f73379984 /drivers/staging/stradis/TODO | |
parent | netfilter: fix Kconfig dependencies (diff) | |
parent | netfilter: ebt_ip6: allow matching on ipv6-icmp types/codes (diff) | |
download | linux-dev-0134e89c7bcc9fde1da962c82a120691e185619f.tar.xz linux-dev-0134e89c7bcc9fde1da962c82a120691e185619f.zip |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts:
net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/staging/stradis/TODO')
-rw-r--r-- | drivers/staging/stradis/TODO | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/stradis/TODO b/drivers/staging/stradis/TODO deleted file mode 100644 index f48150fe2fa9..000000000000 --- a/drivers/staging/stradis/TODO +++ /dev/null @@ -1,6 +0,0 @@ -This is an obsolete driver for ancient stradis hardware. -We couldn't find anyone with this hardware in order to port it to use V4L2. - -If nobody take care on it, the driver will be removed for 2.6.38. - -Please send patches to linux-media@vger.kernel.org |