diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /Documentation/fb/framebuffer.txt | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'Documentation/fb/framebuffer.txt')
| -rw-r--r-- | Documentation/fb/framebuffer.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/fb/framebuffer.txt b/Documentation/fb/framebuffer.txt index b3e3a0356839..fe79e3c8847d 100644 --- a/Documentation/fb/framebuffer.txt +++ b/Documentation/fb/framebuffer.txt | |||
| @@ -312,10 +312,8 @@ and to the following documentation: | |||
| 312 | 8. Mailing list | 312 | 8. Mailing list |
| 313 | --------------- | 313 | --------------- |
| 314 | 314 | ||
| 315 | There are several frame buffer device related mailing lists at SourceForge: | 315 | There is a frame buffer device related mailing list at kernel.org: |
| 316 | - linux-fbdev-announce@lists.sourceforge.net, for announcements, | 316 | linux-fbdev@vger.kernel.org. |
| 317 | - linux-fbdev-user@lists.sourceforge.net, for generic user support, | ||
| 318 | - linux-fbdev-devel@lists.sourceforge.net, for project developers. | ||
| 319 | 317 | ||
| 320 | Point your web browser to http://sourceforge.net/projects/linux-fbdev/ for | 318 | Point your web browser to http://sourceforge.net/projects/linux-fbdev/ for |
| 321 | subscription information and archive browsing. | 319 | subscription information and archive browsing. |