Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35438c43 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'linux-2.6' into for-2.6.24

parents 2f6c9d96 b07d68b5

Documentation/DocBook/deviceiobook.tmpl

+2 −1
Original line number Diff line number Diff line
@@ -316,7 +316,8 @@ CPU B: spin_unlock_irqrestore(&dev_lock, flags) 


  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Einclude/asm-i386/io.h

!Iinclude/asm-i386/io.h

!Elib/iomap.c

  </chapter>



</book>

Documentation/HOWTO

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ tools. One such tool that is particularly recommended is the Linux 
Cross-Reference project, which is able to present source code in a

self-referential, indexed webpage format. An excellent up-to-date

repository of the kernel code may be found at:

	http://sosdg.org/~coywolf/lxr/

	http://users.sosdg.org/~qiyong/lxr/





The development process
@@ -384,7 +384,7 @@ One of the best ways to put into practice your hacking skills is by fixing 
bugs reported by other people. Not only you will help to make the kernel

more stable, you'll learn to fix real world problems and you will improve

your skills, and other developers will be aware of your presence. Fixing

bugs is one of the best ways to earn merit amongst the developers, because

bugs is one of the best ways to get merits among other developers, because

not many people like wasting time fixing other people's bugs.



To work in the already reported bug reports, go to http://bugzilla.kernel.org.

Documentation/SubmittingPatches

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people! 
  <http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>



Kernel Documentation/CodingStyle:

  <http://sosdg.org/~coywolf/lxr/source/Documentation/CodingStyle>

  <http://users.sosdg.org/~qiyong/lxr/source/Documentation/CodingStyle>



Linus Torvalds's mail on the canonical patch format:

  <http://lkml.org/lkml/2005/4/7/183>

Documentation/accounting/getdelays.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void print_delayacct(struct taskstats *t) 
	       "IO    %15s%15s\n"

	       "      %15llu%15llu\n"

	       "MEM   %15s%15s\n"

	       "      %15llu%15llu\n"

	       "      %15llu%15llu\n",

	       "count", "real total", "virtual total", "delay total",

	       t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,

	       t->cpu_delay_total,

Documentation/dvb/get_dvb_firmware

+12 −12
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ sub tda10045 { 
}



sub tda10046 {

    my $sourcefile = "tt_budget_217g.zip";

    my $url = "http://www.technotrend.de/new/217g/$sourcefile";

	my $sourcefile = "TT_PCI_2.19h_28_11_2006.zip";

	my $url = "http://technotrend-online.com/download/software/219/$sourcefile";

	my $hash = "6a7e1e2f2644b162ff0502367553c72d";

	my $outfile = "dvb-fe-tda10046.fw";

	my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
@@ -121,7 +121,7 @@ sub tda10046 { 


	wgetfile($sourcefile, $url);

	unzip($sourcefile, $tmpdir);

    extract("$tmpdir/software/OEM/PCI/App/ttlcdacc.dll", 0x3f731, 24478, "$tmpdir/fwtmp");

	extract("$tmpdir/TT_PCI_2.19h_28_11_2006/software/OEM/PCI/App/ttlcdacc.dll", 0x65389, 24478, "$tmpdir/fwtmp");

	verify("$tmpdir/fwtmp", $hash);

	copy("$tmpdir/fwtmp", $outfile);