Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (66643de4) · Commits · e / devices / android_kernel_teracube_2e

CREDITS

+2 −7

Original line number	Diff line number	Diff line
		@@ -3241,14 +3241,9 @@ S: 12725 SW Millikan Way, Suite 400
		S: Beaverton, Oregon 97005
		S: USA

		N: Marcelo W. Tosatti
		E: marcelo.tosatti@cyclades.com
		D: Miscellaneous kernel hacker
		N: Marcelo Tosatti
		E: marcelo@kvack.org
		D: v2.4 kernel maintainer
		D: Current pc300/cyclades maintainer
		S: Cyclades Corporation
		S: Av Cristovao Colombo, 462. Floresta.
		S: Porto Alegre
		S: Brazil

		N: Stefan Traby

+0 −5

Original line number	Diff line number	Diff line
		@@ -1721,11 +1721,6 @@ Your cooperation is appreciated.
		These devices support the same API as the generic SCSI
		devices.

		97 block Packet writing for CD/DVD devices
		0 = /dev/pktcdvd0 First packet-writing module
		1 = /dev/pktcdvd1 Second packet-writing module
		...

		98 char Control and Measurement Device (comedi)
		0 = /dev/comedi0 First comedi device
		1 = /dev/comedi1 Second comedi device

+4 −4

Original line number	Diff line number	Diff line
		@@ -259,9 +259,9 @@ sub dibusb {
		}

		sub nxt2002 {
		my $sourcefile = "Broadband4PC_4_2_11.zip";
		my $sourcefile = "Technisat_DVB-PC_4_4_COMPACT.zip";
		my $url = "http://www.bbti.us/download/windows/$sourcefile";
		my $hash = "c6d2ea47a8f456d887ada0cfb718ff2a";
		my $hash = "476befae8c7c1bb9648954060b1eec1f";
		my $outfile = "dvb-fe-nxt2002.fw";
		my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);

		@@ -269,8 +269,8 @@ sub nxt2002 {

		wgetfile($sourcefile, $url);
		unzip($sourcefile, $tmpdir);
		verify("$tmpdir/SkyNETU.sys", $hash);
		extract("$tmpdir/SkyNETU.sys", 375832, 5908, $outfile);
		verify("$tmpdir/SkyNET.sys", $hash);
		extract("$tmpdir/SkyNET.sys", 331624, 5908, $outfile);

		$outfile;
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,15 @@ Who: Jody McIntyre <scjody@steamballoon.com>

		---------------------------

		What: sbp2: module parameter "force_inquiry_hack"
		When: July 2006
		Why: Superceded by parameter "workarounds". Both parameters are meant to be
		used ad-hoc and for single devices only, i.e. not in modprobe.conf,
		therefore the impact of this feature replacement should be low.
		Who: Stefan Richter <stefanr@s5r6.in-berlin.de>

		---------------------------

		What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
		When: July 2006
		Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6

+0 −17

Original line number	Diff line number	Diff line
		@@ -105,20 +105,3 @@
		on the setup, so I think that the choice on what firmware to make
		persistent should be left to userspace.

		- Why register_firmware()+__init can be useful:
		- For boot devices needing firmware.
		- To make the transition easier:
		The firmware can be declared __init and register_firmware()
		called on module_init. Then the firmware is warranted to be
		there even if "firmware hotplug userspace" is not there yet or
		it doesn't yet provide the needed firmware.
		Once the firmware is widely available in userspace, it can be
		removed from the kernel. Or made optional (CONFIG_.*_FIRMWARE).

		In either case, if firmware hotplug support is there, it can move the
		firmware out of kernel memory into the real filesystem for later
		usage.

		Note: If persistence is implemented on top of initramfs,
		register_firmware() may not be appropriate.