diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/otus/TODO | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/TODO')
| -rw-r--r-- | drivers/staging/otus/TODO | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/otus/TODO b/drivers/staging/otus/TODO deleted file mode 100644 index 6fea974..0000000 --- a/drivers/staging/otus/TODO +++ /dev/null @@ -1,8 +0,0 @@ -I'm hesitant to add a TODO file here, as the wireless developers would -really have people help them out on the "clean" ar9170 driver that can -be found at the linux-wireless developer site. - -This driver is unmaintained and its only purpose is as a -source of documentation for developers working on ar9170 and carl9170. -Once carl9170 gets 11n support and merged upstream then this driver -can be removed. |
