Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 42417
b: refs/heads/master
c: 3e082a9
h: refs/heads/master
i:
  42415: 2261d9e
v: v3
  • Loading branch information
Matthew Wilcox authored and James Bottomley committed Oct 11, 2006
1 parent b0ee3f7 commit a85d753
Show file tree
Hide file tree
Showing 3,477 changed files with 69,774 additions and 157,036 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bf83c2a315637dee8a8b5c2221ce5030cc38c6db
refs/heads/master: 3e082a910d217b2e7b186077ebf5a1126a68c62f
1 change: 0 additions & 1 deletion trunk/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
# Top-level generic files
#
tags
TAGS
vmlinux*
System.map
Module.symvers
Expand Down
11 changes: 5 additions & 6 deletions trunk/CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ S: Longford, Ireland
S: Sydney, Australia

N: Tigran A. Aivazian
E: tigran@aivazian.fsnet.co.uk
E: tigran@veritas.com
W: http://www.moses.uklinux.net/patches
D: BFS filesystem
D: Intel IA32 CPU microcode update support
Expand Down Expand Up @@ -2598,9 +2598,6 @@ S: Ucitelska 1576
S: Prague 8
S: 182 00 Czech Republic

N: Rick Payne
D: RFC2385 Support for TCP

N: Barak A. Pearlmutter
E: bap@cs.unm.edu
W: http://www.cs.unm.edu/~bap/
Expand Down Expand Up @@ -3514,12 +3511,14 @@ D: The Linux Support Team Erlangen

N: David Weinehall
E: tao@acc.umu.se
P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36 E1D1 D14E 8526 DC47 CA16
W: http://www.acc.umu.se/~tao/
D: v2.0 kernel maintainer
W: http://www.acc.umu.se/~mcalinux/
D: Fixes for the NE/2-driver
D: Miscellaneous MCA-support
D: Cleanup of the Config-files
S: Axtorpsvagen 40:20
S: S-903 37 UMEA
S: Sweden

N: Matt Welsh
E: mdw@metalab.unc.edu
Expand Down
2 changes: 2 additions & 0 deletions trunk/Documentation/00-INDEX
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ firmware_class/
- request_firmware() hotplug interface info.
floppy.txt
- notes and driver options for the floppy disk driver.
ftape.txt
- notes about the floppy tape device driver.
hayes-esp.txt
- info on using the Hayes ESP serial driver.
highuid.txt
Expand Down
17 changes: 1 addition & 16 deletions trunk/Documentation/ABI/testing/sysfs-power
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Description:
these states.

What: /sys/power/disk
Date: September 2006
Date: August 2006
Contact: Rafael J. Wysocki <rjw@sisk.pl>
Description:
The /sys/power/disk file controls the operating mode of the
Expand All @@ -39,28 +39,13 @@ Description:
'reboot' - the memory image will be saved by the kernel and
the system will be rebooted.

Additionally, /sys/power/disk can be used to turn on one of the
two testing modes of the suspend-to-disk mechanism: 'testproc'
or 'test'. If the suspend-to-disk mechanism is in the
'testproc' mode, writing 'disk' to /sys/power/state will cause
the kernel to disable nonboot CPUs and freeze tasks, wait for 5
seconds, unfreeze tasks and enable nonboot CPUs. If it is in
the 'test' mode, writing 'disk' to /sys/power/state will cause
the kernel to disable nonboot CPUs and freeze tasks, shrink
memory, suspend devices, wait for 5 seconds, resume devices,
unfreeze tasks and enable nonboot CPUs. Then, we are able to
look in the log messages and work out, for example, which code
is being slow and which device drivers are misbehaving.

The suspend-to-disk method may be chosen by writing to this
file one of the accepted strings:

'firmware'
'platform'
'shutdown'
'reboot'
'testproc'
'test'

It will only change to 'firmware' or 'platform' if the system
supports that.
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/Changes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ udev
----
udev is a userspace application for populating /dev dynamically with
only entries for devices actually present. udev replaces the basic
functionality of devfs, while allowing persistent device naming for
functionality of devfs, while allowing persistant device naming for
devices.

FUSE
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DMA-API.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ size is the size of the area (must be multiples of PAGE_SIZE).
flags can be or'd together and are

DMA_MEMORY_MAP - request that the memory returned from
dma_alloc_coherent() be directly writable.
dma_alloc_coherent() be directly writeable.

DMA_MEMORY_IO - request that the memory returned from
dma_alloc_coherent() be addressable using read/write/memcpy_toio etc.
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DMA-ISA-LPC.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ lock.

Once the DMA transfer is finished (or timed out) you should disable
the channel again. You should also check get_dma_residue() to make
sure that all data has been transferred.
sure that all data has been transfered.

Example:

Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
procfs-guide.xml writing_usb_driver.xml \
kernel-api.xml filesystems.xml lsm.xml usb.xml \
kernel-api.xml journal-api.xml lsm.xml usb.xml \
gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
genericirq.xml

Expand Down
Loading

0 comments on commit a85d753

Please sign in to comment.