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

Commit 749dfc70 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes'

parents 74f5ec29 0992a5d0

CREDITS

+2 −4
Original line number Diff line number Diff line
@@ -3643,11 +3643,9 @@ S: Cambridge. CB1 7EG 
S: England



N: Chris Wright

E: chrisw@osdl.org

E: chrisw@sous-sol.org

D: hacking on LSM framework and security modules.

S: c/o OSDL

S: 12725 SW Millikan Way, Suite 400

S: Beaverton, OR 97005

S: Portland, OR

S: USA



N: Michal Wronski

Documentation/dvb/bt8xx.txt

+5 −1
Original line number Diff line number Diff line
@@ -111,4 +111,8 @@ source: linux/Documentation/video4linux/CARDLIST.bttv 
If you have problems with this please do ask on the mailing list.



--

Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham
 
Authors: Richard Walker,

	 Jamie Honan,

	 Michael Hunold,

	 Manu Abraham,

	 Michael Krufky

Documentation/feature-removal-schedule.txt

+9 −0
Original line number Diff line number Diff line
@@ -187,3 +187,12 @@ Why: These events are not correct, and do not properly let userspace know 
	when a file system has been mounted or unmounted.  Userspace should

	poll the /proc/mounts file instead to detect this properly.

Who:	Greg Kroah-Hartman <gregkh@suse.de>



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



What:	Support for NEC DDB5074 and DDB5476 evaluation boards.

When:	June 2006

Why:	Board specific code doesn't build anymore since ~2.6.0 and no

	users have complained indicating there is no more need for these

	boards.  This should really be considered a last call.

Who:	Ralf Baechle <ralf@linux-mips.org>

Documentation/kernel-parameters.txt

+19 −0
Original line number Diff line number Diff line
@@ -335,6 +335,12 @@ running once the system is up. 
			timesource is not avalible, it defaults to PIT.

			Format: { pit | tsc | cyclone | pmtmr }



	disable_8254_timer

	enable_8254_timer

			[IA32/X86_64] Disable/Enable interrupt 0 timer routing

			over the 8254 in addition to over the IO-APIC. The

			kernel tries to set a sensible default.



	hpet=		[IA-32,HPET] option to disable HPET and use PIT.

			Format: disable
@@ -1284,6 +1290,19 @@ running once the system is up. 
			New name for the ramdisk parameter.

			See Documentation/ramdisk.txt.



	rcu.blimit=	[KNL,BOOT] Set maximum number of finished

			RCU callbacks to process in one batch.



	rcu.qhimark=	[KNL,BOOT] Set threshold of queued

			RCU callbacks over which batch limiting is disabled.



	rcu.qlowmark=	[KNL,BOOT] Set threshold of queued

			RCU callbacks below which batch limiting is re-enabled.



	rcu.rsinterval=	[KNL,BOOT,SMP] Set the number of additional

			RCU callbacks to queued before forcing reschedule

			on all cpus.



	rdinit=		[KNL]

			Format: <full_path>

			Run specified binary instead of /init from the ramdisk,

Documentation/video4linux/CARDLIST.saa7134

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 12 -> Medion 7134                              [16be:0003]

 13 -> Typhoon TV+Radio 90031

 14 -> ELSA EX-VISION 300TV                     [1048:226b]

 15 -> ELSA EX-VISION 500TV                     [1048:226b]

 15 -> ELSA EX-VISION 500TV                     [1048:226a]

 16 -> ASUS TV-FM 7134                          [1043:4842,1043:4830,1043:4840]

 17 -> AOPEN VA1000 POWER                       [1131:7133]

 18 -> BMK MPEX No Tuner
@@ -75,7 +75,7 @@ 
 74 -> LifeView FlyTV Platinum Mini2            [14c0:1212]

 75 -> AVerMedia AVerTVHD MCE A180              [1461:1044]

 76 -> SKNet MonsterTV Mobile                   [1131:4ee9]

 77 -> Pinnacle PCTV 110i (saa7133)             [11bd:002e]

 77 -> Pinnacle PCTV 40i/50i/110i (saa7133)     [11bd:002e]

 78 -> ASUSTeK P7131 Dual                       [1043:4862]

 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)

 80 -> ASUS Digimatrix TV                       [1043:0210]