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

Commit 3f02d072 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

parents 0238cb4e fb453d4b

Documentation/DocBook/videobook.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ int __init myradio_init(struct video_init *v) 


static int users = 0;



static int radio_open(stuct video_device *dev, int flags)

static int radio_open(struct video_device *dev, int flags)

{

        if(users)

                return -EBUSY;
@@ -949,7 +949,7 @@ int __init mycamera_init(struct video_init *v) 


static int users = 0;



static int camera_open(stuct video_device *dev, int flags)

static int camera_open(struct video_device *dev, int flags)

{

        if(users)

                return -EBUSY;

Documentation/cachetlb.txt

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ changes occur: 
8) void lazy_mmu_prot_update(pte_t pte)

	This interface is called whenever the protection on

	any user PTEs change.  This interface provides a notification

	to architecture specific code to take appropiate action.

	to architecture specific code to take appropriate action.





Next, we have the cache flushing interfaces.  In general, when Linux

Documentation/hpet.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


The High Precision Event Timer (HPET) hardware is the future replacement

for the 8254 and Real Time Clock (RTC) periodic timer functionality.

Each HPET can have up two 32 timers.  It is possible to configure the

Each HPET can have up to 32 timers.  It is possible to configure the

first two timers as legacy replacements for 8254 and RTC periodic timers.

A specification done by Intel and Microsoft can be found at

<http://www.intel.com/hardwaredesign/hpetspec.htm>.

Documentation/input/ff.txt

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ to the unique id assigned by the driver. This data is required for performing 
some operations (removing an effect, controlling the playback).

This if field must be set to -1 by the user in order to tell the driver to

allocate a new effect.

See <linux/input.h> for a description of the ff_effect stuct. You should also

See <linux/input.h> for a description of the ff_effect struct. You should also

find help in a few sketches, contained in files shape.fig and interactive.fig.

You need xfig to visualize these files.

Documentation/ioctl/hdio.txt

+1 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ HDIO_SCAN_HWIF register and (re)scan interface 


	  This ioctl initializes the addresses and irq for a disk

	  controller, probes for drives, and creates /proc/ide

	  interfaces as appropiate.

	  interfaces as appropriate.