Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2007-08-23 10:43:14 +01:00
parent 68d09b1b67 b377fd3982
commit ac0c955d50
682 changed files with 11798 additions and 8145 deletions
@@ -133,10 +133,6 @@ interested in translating it, please email me
 	<para>updates of your driver can take place without recompiling
 	the kernel.</para>
 </listitem>
-<listitem>
-	<para>if you need to keep some parts of your driver closed source,
-	you can do so without violating the GPL license on the kernel.</para>
-</listitem>
 </itemizedlist>

 <sect1 id="how_uio_works">