Merge with /home/shaggy/git/linus-clean/

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.

logo_*_clut224.c

logo_*_mono.c

lxdialog

mach-types

mach-types.h

make_times_h

map

	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