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

Commit c973b112 authored by David Woodhouse's avatar David Woodhouse
Browse files

Merge with /shiny/git/linux-2.6/.git

parents c5fbc396 00dd1e43
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -1624,10 +1624,10 @@ E: ajoshi@shell.unixbox.com
D: fbdev hacking

N: Jesper Juhl
E: juhl-lkml@dif.dk
D: Various small janitor fixes, cleanups etc.
E: jesper.juhl@gmail.com
D: Various fixes, cleanups and minor features.
S: Lemnosvej 1, 3.tv
S: 2300 Copenhagen S
S: 2300 Copenhagen S.
S: Denmark

N: Jozsef Kadlecsik
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com
D: bug fixes, documentation, minor hackery

N: James Morris
E: jmorris@redhat.com
W: http://www.intercode.com.au/jmorris/
E: jmorris@namei.org
W: http://namei.org/
D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
D: Crypto API, general networking, miscellaneous.
S: PO Box 707
+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ o isdn4k-utils 3.1pre1 # isdnctrl 2>&1|grep version
o  nfs-utils              1.0.5                   # showmount --version
o  procps                 3.2.0                   # ps --version
o  oprofile               0.9                     # oprofiled --version
o  udev                   058                     # udevinfo -V

Kernel compilation
==================
+5 −0
Original line number Diff line number Diff line
@@ -149,6 +149,11 @@ USB, framebuffer devices, the VFS, the SCSI subsystem, etc. See the
MAINTAINERS file for a mailing list that relates specifically to
your change.

If changes affect userland-kernel interfaces, please send
the MAN-PAGES maintainer (as listed in the MAINTAINERS file)
a man-pages patch, or at least a notification of the change,
so that some information makes its way into the manual pages.

Even if the maintainer did not respond in step #4, make sure to ALWAYS
copy the maintainer when you change their code.

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ logo_*.c
logo_*_clut224.c
logo_*_mono.c
lxdialog
mach-types
mach-types.h
make_times_h
map
+15 −1
Original line number Diff line number Diff line
@@ -144,7 +144,21 @@ vgapal Use the standard vga registers for palette changes.
	This is the default.
pmipal	Use the protected mode interface for palette changes.

mtrr	setup memory type range registers for the vesafb framebuffer.
mtrr:n	setup memory type range registers for the vesafb framebuffer
	where n:
	      0 - disabled (equivalent to nomtrr)
	      1 - uncachable
	      2 - write-back
	      3 - write-combining (default)
	      4 - write-through

	If you see the following in dmesg, choose the type that matches the
	old one. In this example, use "mtrr:2".
...
mtrr: type mismatch for e0000000,8000000 old: write-back new: write-combining
...

nomtrr  disable mtrr

vremap:n
        remap 'n' MiB of video RAM. If 0 or not specified, remap memory
Loading