Merge branch 'master' into work

      </sect2>

    </sect1>

  </chapter>

  <chapter id="clk">

    <title>Clock Framework Extensions</title>

!Iinclude/linux/sh_clk.h

  </chapter>

  <chapter id="mach">

    <title>Machine Specific Interfaces</title>

    <sect1 id="dreamcast">

	</orgname>

	<address>

	   <email>hjk@linutronix.de</email>

	   <email>hjk@hansjkoch.de</email>

	</address>

    </affiliation>

</author>

<para>If you know of any translations for this document, or you are

interested in translating it, please email me

<email>hjk@linutronix.de</email>.

<email>hjk@hansjkoch.de</email>.

</para>

</sect1>

<title>Feedback</title>

	<para>Find something wrong with this document? (Or perhaps something

	right?) I would love to hear from you. Please email me at

	<email>hjk@linutronix.de</email>.</para>

	<email>hjk@hansjkoch.de</email>.</para>

</sect1>

</chapter>

   inclusion, it should be accepted by a relevant subsystem maintainer -

   though this acceptance is not a guarantee that the patch will make it

   all the way to the mainline.  The patch will show up in the maintainer's

   subsystem tree and into the staging trees (described below).  When the

   subsystem tree and into the -next trees (described below).  When the

   process works, this step leads to more extensive review of the patch and

   the discovery of any problems resulting from the integration of this

   patch with work being done by others.

normally the right way to go.

2.4: STAGING TREES

2.4: NEXT TREES

The chain of subsystem trees guides the flow of patches into the kernel,

but it also raises an interesting question: what if somebody wants to look

the interesting subsystem trees, but that would be a big and error-prone

job.

The answer comes in the form of staging trees, where subsystem trees are

The answer comes in the form of -next trees, where subsystem trees are

collected for testing and review.  The older of these trees, maintained by

Andrew Morton, is called "-mm" (for memory management, which is how it got

started).  The -mm tree integrates patches from a long list of subsystem

Use of the MMOTM tree is likely to be a frustrating experience, though;

there is a definite chance that it will not even compile.

The other staging tree, started more recently, is linux-next, maintained by

The other -next tree, started more recently, is linux-next, maintained by

Stephen Rothwell.  The linux-next tree is, by design, a snapshot of what

the mainline is expected to look like after the next merge window closes.

Linux-next trees are announced on the linux-kernel and linux-next mailing

See http://lwn.net/Articles/289013/ for more information on this topic, and

stay tuned; much is still in flux where linux-next is involved.

Besides the mmotm and linux-next trees, the kernel source tree now contains

the drivers/staging/ directory and many sub-directories for drivers or

filesystems that are on their way to being added to the kernel tree

proper, but they remain in drivers/staging/ while they still need more

work.

2.4.1: STAGING TREES

The kernel source tree now contains the drivers/staging/ directory, where

many sub-directories for drivers or filesystems that are on their way to

being added to the kernel tree live.  They remain in drivers/staging while

they still need more work; once complete, they can be moved into the

kernel proper.  This is a way to keep track of drivers that aren't

up to Linux kernel coding or quality standards, but people may want to use

them and track development.

Greg Kroah-Hartman currently (as of 2.6.36) maintains the staging tree.

Drivers that still need work are sent to him, with each driver having

its own subdirectory in drivers/staging/.  Along with the driver source

files, a TODO file should be present in the directory as well.  The TODO

file lists the pending work that the driver needs for acceptance into

the kernel proper, as well as a list of people that should be Cc'd for any

patches to the driver.  Staging drivers that don't currently build should

have their config entries depend upon CONFIG_BROKEN.  Once they can

be successfully built without outside patches, CONFIG_BROKEN can be removed.

2.5: TOOLS

				    Geert Uytterhoeven <geert@linux-m68k.org>

00-INDEX

	- this file

	- this file.

arkfb.txt

	- info on the fbdev driver for ARK Logic chips.

aty128fb.txt

	- info on the ATI Rage128 frame buffer driver.

cirrusfb.txt

	- info on the driver for Cirrus Logic chipsets.

cmap_xfbdev.txt

	- an introduction to fbdev's cmap structures.

deferred_io.txt

	- an introduction to deferred IO.

efifb.txt

	- info on the EFI platform driver for Intel based Apple computers.

ep93xx-fb.txt

	- info on the driver for EP93xx LCD controller.

fbcon.txt

	- intro to and usage guide for the framebuffer console (fbcon).

framebuffer.txt

	- introduction to frame buffer devices.

imacfb.txt

	- info on the generic EFI platform driver for Intel based Macs.

gxfb.txt

	- info on the framebuffer driver for AMD Geode GX2 based processors.

intel810.txt

	- documentation for the Intel 810/815 framebuffer driver.

intelfb.txt

	- docs for Intel 830M/845G/852GM/855GM/865G/915G/945G fb driver.

internals.txt

	- quick overview of frame buffer device internals.

lxfb.txt

	- info on the framebuffer driver for AMD Geode LX based processors.

matroxfb.txt

	- info on the Matrox framebuffer driver for Alpha, Intel and PPC.

metronomefb.txt

	- info on the driver for the Metronome display controller.

modedb.txt

	- info on the video mode database.

matroxfb.txt

	- info on the Matrox frame buffer driver.

pvr2fb.txt

	- info on the PowerVR 2 frame buffer driver.

pxafb.txt

	- info on the fbdev driver for S3 Trio/Virge chips.

sa1100fb.txt

	- information about the driver for the SA-1100 LCD controller.

sh7760fb.txt

	- info on the SH7760/SH7763 integrated LCDC Framebuffer driver.

sisfb.txt

	- info on the framebuffer device driver for various SiS chips.

sstfb.txt

	- info on the frame buffer driver for 3dfx' Voodoo Graphics boards.

tgafb.txt

	- info on the TGA (DECChip 21030) frame buffer driver

	- info on the TGA (DECChip 21030) frame buffer driver.

tridentfb.txt

	info on the framebuffer driver for some Trident chip based cards.

uvesafb.txt

	- info on the userspace VESA (VBE2+ compliant) frame buffer device.

vesafb.txt

	- info on the VESA frame buffer device

	- info on the VESA frame buffer device.

viafb.modes

	- list of modes for VIA Integration Graphic Chip.

viafb.txt

	- info on the VIA Integration Graphic Chip console framebuffer driver.

vt8623fb.txt

	- info on the fb driver for the graphics core in VIA VT8623 chipsets.

	char *p = (char *) page;

	tmp = simple_strtoul(p, &p, 10);

	if (!p || (*p && (*p != '\n')))

	if ((*p != '\0') && (*p != '\n'))

		return -EINVAL;

	if (tmp > INT_MAX)