Commit 50170656 authored by David S. Miller's avatar David S. Miller

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	include/net/tcp.h
parents e93737b0 2fe77b81

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

What: /sys/bus/pci/drivers/qla2xxx/.../devices/*
Date: September 2009
Contact: QLogic Linux Driver <linux-driver@qlogic.com>
Description: qla2xxx-udev.sh currently looks for uevent CHANGE events to
signal a firmware-dump has been generated by the driver and is
ready for retrieval.
Users: qla2xxx-udev.sh. Proposed changes should be mailed to
linux-driver@qlogic.com
...@@ -8,7 +8,7 @@ Description: ...@@ -8,7 +8,7 @@ Description:
1 - major number 1 - major number
2 - minor mumber 2 - minor mumber
3 - device name 3 - device name
4 - reads completed succesfully 4 - reads completed successfully
5 - reads merged 5 - reads merged
6 - sectors read 6 - sectors read
7 - time spent reading (ms) 7 - time spent reading (ms)
......
...@@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com> ...@@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com>
Description: Description:
The /sys/block/<disk>/stat files displays the I/O The /sys/block/<disk>/stat files displays the I/O
statistics of disk <disk>. They contain 11 fields: statistics of disk <disk>. They contain 11 fields:
1 - reads completed succesfully 1 - reads completed successfully
2 - reads merged 2 - reads merged
3 - sectors read 3 - sectors read
4 - time spent reading (ms) 4 - time spent reading (ms)
......
...@@ -144,3 +144,16 @@ Description: ...@@ -144,3 +144,16 @@ Description:
Write a 1 to force the device to disconnect Write a 1 to force the device to disconnect
(equivalent to unplugging a wired USB device). (equivalent to unplugging a wired USB device).
What: /sys/bus/usb/drivers/.../remove_id
Date: November 2009
Contact: CHENG Renquan <rqcheng@smu.edu.sg>
Description:
Writing a device ID to this file will remove an ID
that was dynamically added via the new_id sysfs entry.
The format for the device ID is:
idVendor idProduct. After successfully
removing an ID, the driver will no longer support the
device. This is useful to ensure auto probing won't
match the driver to the device. For example:
# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id
...@@ -23,3 +23,16 @@ Description: ...@@ -23,3 +23,16 @@ Description:
Since this relates to security (specifically, the Since this relates to security (specifically, the
lifetime of PTKs and GTKs) it should not be changed lifetime of PTKs and GTKs) it should not be changed
from the default. from the default.
What: /sys/class/uwb_rc/uwbN/wusbhc/wusb_phy_rate
Date: August 2009
KernelVersion: 2.6.32
Contact: David Vrabel <david.vrabel@csr.com>
Description:
The maximum PHY rate to use for all connected devices.
This is only of limited use for testing and
development as the hardware's automatic rate
adaptation is better then this simple control.
Refer to [ECMA-368] section 10.3.1.1 for the value to
use.
...@@ -136,6 +136,24 @@ Description: Discover cpuidle policy and mechanism ...@@ -136,6 +136,24 @@ Description: Discover cpuidle policy and mechanism
See files in Documentation/cpuidle/ for more information. See files in Documentation/cpuidle/ for more information.
What: /sys/devices/system/cpu/cpu#/cpufreq/*
Date: pre-git history
Contact: cpufreq@vger.kernel.org
Description: Discover and change clock speed of CPUs
Clock scaling allows you to change the clock speed of the
CPUs on the fly. This is a nice method to save battery
power, because the lower the clock speed, the less power
the CPU consumes.
There are many knobs to tweak in this directory.
See files in Documentation/cpu-freq/ for more information.
In particular, read Documentation/cpu-freq/user-guide.txt
to learn how to control the knobs.
What: /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X What: /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X
Date: August 2008 Date: August 2008
KernelVersion: 2.6.27 KernelVersion: 2.6.27
......
...@@ -214,7 +214,7 @@ most specific mask. ...@@ -214,7 +214,7 @@ most specific mask.
Here is pseudo-code showing how this might be done: Here is pseudo-code showing how this might be done:
#define PLAYBACK_ADDRESS_BITS DMA_BIT_MASK(32) #define PLAYBACK_ADDRESS_BITS DMA_BIT_MASK(32)
#define RECORD_ADDRESS_BITS 0x00ffffff #define RECORD_ADDRESS_BITS DMA_BIT_MASK(24)
struct my_sound_card *card; struct my_sound_card *card;
struct pci_dev *pdev; struct pci_dev *pdev;
...@@ -224,14 +224,14 @@ Here is pseudo-code showing how this might be done: ...@@ -224,14 +224,14 @@ Here is pseudo-code showing how this might be done:
card->playback_enabled = 1; card->playback_enabled = 1;
} else { } else {
card->playback_enabled = 0; card->playback_enabled = 0;
printk(KERN_WARN "%s: Playback disabled due to DMA limitations.\n", printk(KERN_WARNING "%s: Playback disabled due to DMA limitations.\n",
card->name); card->name);
} }
if (!pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) { if (!pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) {
card->record_enabled = 1; card->record_enabled = 1;
} else { } else {
card->record_enabled = 0; card->record_enabled = 0;
printk(KERN_WARN "%s: Record disabled due to DMA limitations.\n", printk(KERN_WARNING "%s: Record disabled due to DMA limitations.\n",
card->name); card->name);
} }
......
...@@ -293,10 +293,23 @@ X!Idrivers/video/console/fonts.c ...@@ -293,10 +293,23 @@ X!Idrivers/video/console/fonts.c
<chapter id="input_subsystem"> <chapter id="input_subsystem">
<title>Input Subsystem</title> <title>Input Subsystem</title>
<sect1><title>Input core</title>
!Iinclude/linux/input.h !Iinclude/linux/input.h
!Edrivers/input/input.c !Edrivers/input/input.c
!Edrivers/input/ff-core.c !Edrivers/input/ff-core.c
!Edrivers/input/ff-memless.c !Edrivers/input/ff-memless.c
</sect1>
<sect1><title>Polled input devices</title>
!Iinclude/linux/input-polldev.h
!Edrivers/input/input-polldev.c
</sect1>
<sect1><title>Matrix keyboars/keypads</title>
!Iinclude/linux/input/matrix_keypad.h
</sect1>
<sect1><title>Sparse keymap support</title>
!Iinclude/linux/input/sparse-keymap.h
!Edrivers/input/sparse-keymap.c
</sect1>
</chapter> </chapter>
<chapter id="spi"> <chapter id="spi">
......
...@@ -29,6 +29,14 @@ ...@@ -29,6 +29,14 @@
<revhistory> <revhistory>
<!-- Put document revisions here, newest first. --> <!-- Put document revisions here, newest first. -->
<revision>
<revnumber>2.0.2</revnumber>
<date>2009-10-25</date>
<authorinitials>mcc</authorinitials>
<revremark>
documents FE_SET_FRONTEND_TUNE_MODE and FE_DISHETWORK_SEND_LEGACY_CMD ioctls.
</revremark>
</revision>
<revision> <revision>
<revnumber>2.0.1</revnumber> <revnumber>2.0.1</revnumber>
<date>2009-09-16</date> <date>2009-09-16</date>
...@@ -85,3 +93,8 @@ Added ISDB-T test originally written by Patrick Boettcher ...@@ -85,3 +93,8 @@ Added ISDB-T test originally written by Patrick Boettcher
&sub-examples; &sub-examples;
</chapter> </chapter>
<!-- END OF CHAPTERS --> <!-- END OF CHAPTERS -->
<appendix id="frontend_h">
<title>DVB Frontend Header File</title>
&sub-frontend-h;
</appendix>
<section id="FE_GET_PROPERTY">
<title>FE_GET_PROPERTY/FE_SET_PROPERTY</title>
<section id="isdbt"> <section id="isdbt">
<title>ISDB-T frontend</title> <title>ISDB-T frontend</title>
<para>This section describes shortly what are the possible parameters in the Linux <para>This section describes shortly what are the possible parameters in the Linux
...@@ -312,3 +315,4 @@ ...@@ -312,3 +315,4 @@
</section> </section>
</section> </section>
</section>