aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/ntfs.txt2
-rw-r--r--Documentation/hwmon/w837938
-rw-r--r--Documentation/powerpc/mpc52xx-device-tree-bindings.txt6
-rw-r--r--Documentation/scsi/aacraid.txt66
4 files changed, 48 insertions, 34 deletions
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
index 13ba649bda75..81779068b09b 100644
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
@@ -457,6 +457,8 @@ ChangeLog
457 457
458Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. 458Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
459 459
4602.1.28:
461 - Fix a deadlock.
4602.1.27: 4622.1.27:
461 - Implement page migration support so the kernel can move memory used 463 - Implement page migration support so the kernel can move memory used
462 by NTFS files and directories around for management purposes. 464 by NTFS files and directories around for management purposes.
diff --git a/Documentation/hwmon/w83793 b/Documentation/hwmon/w83793
index 45e5408340e0..51171a83165b 100644
--- a/Documentation/hwmon/w83793
+++ b/Documentation/hwmon/w83793
@@ -45,18 +45,14 @@ This driver implements support for Winbond W83793G/W83793R chips.
45 temp5-6 have a 1 degree Celsiis resolution. 45 temp5-6 have a 1 degree Celsiis resolution.
46 46
47* Temperature sensor types 47* Temperature sensor types
48 Temp1-4 have 3 possible types. It can be read from (and written to) 48 Temp1-4 have 2 possible types. It can be read from (and written to)
49 temp[1-4]_type. 49 temp[1-4]_type.
50 - If the value of 0, the related temperature channel stops
51 monitoring.
52 - If the value is 3, it starts monitoring using a remote termal diode 50 - If the value is 3, it starts monitoring using a remote termal diode
53 (default). 51 (default).
54 - If the value is 5, it starts monitoring using the temperature sensor
55 in AMD CPU and get result by AMDSI.
56 - If the value is 6, it starts monitoring using the temperature sensor 52 - If the value is 6, it starts monitoring using the temperature sensor
57 in Intel CPU and get result by PECI. 53 in Intel CPU and get result by PECI.
58 Temp5-6 can be connected to external thermistors (value of 54 Temp5-6 can be connected to external thermistors (value of
59 temp[5-6]_type is 4). They can also be disabled (value is 0). 55 temp[5-6]_type is 4).
60 56
61* Alarm mechanism 57* Alarm mechanism
62 For voltage sensors, an alarm triggers if the measured value is below 58 For voltage sensors, an alarm triggers if the measured value is below
diff --git a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
index 7fb3b8a44eb6..69f016f02bb0 100644
--- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
+++ b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
@@ -4,6 +4,12 @@ MPC52xx Device Tree Bindings
4(c) 2006 Secret Lab Technologies Ltd 4(c) 2006 Secret Lab Technologies Ltd
5Grant Likely <grant.likely at secretlab.ca> 5Grant Likely <grant.likely at secretlab.ca>
6 6
7********** DRAFT ***********
8* WARNING: Do not depend on the stability of these bindings just yet.
9* The MPC5200 device tree conventions are still in flux
10* Keep an eye on the linuxppc-dev mailing list for more details
11********** DRAFT ***********
12
7I - Introduction 13I - Introduction
8================ 14================
9Boards supported by the arch/powerpc architecture require device tree be 15Boards supported by the arch/powerpc architecture require device tree be
diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt
index 3367130e64f6..dc8e44fc650f 100644
--- a/Documentation/scsi/aacraid.txt
+++ b/Documentation/scsi/aacraid.txt
@@ -11,43 +11,42 @@ the original).
11Supported Cards/Chipsets 11Supported Cards/Chipsets
12------------------------- 12-------------------------
13 PCI ID (pci.ids) OEM Product 13 PCI ID (pci.ids) OEM Product
14 9005:0283:9005:0283 Adaptec Catapult (3210S with arc firmware)
15 9005:0284:9005:0284 Adaptec Tomcat (3410S with arc firmware)
16 9005:0285:9005:0285 Adaptec 2200S (Vulcan) 14 9005:0285:9005:0285 Adaptec 2200S (Vulcan)
17 9005:0285:9005:0286 Adaptec 2120S (Crusader) 15 9005:0285:9005:0286 Adaptec 2120S (Crusader)
18 9005:0285:9005:0287 Adaptec 2200S (Vulcan-2m) 16 9005:0285:9005:0287 Adaptec 2200S (Vulcan-2m)
19 9005:0285:9005:0288 Adaptec 3230S (Harrier) 17 9005:0285:9005:0288 Adaptec 3230S (Harrier)
20 9005:0285:9005:0289 Adaptec 3240S (Tornado) 18 9005:0285:9005:0289 Adaptec 3240S (Tornado)
21 9005:0285:9005:028a Adaptec 2020ZCR (Skyhawk) 19 9005:0285:9005:028a Adaptec 2020ZCR (Skyhawk)
22 9005:0285:9005:028b Adaptec 2025ZCR (Terminator) 20 9005:0285:9005:028b Adaptec 2025ZCR (Terminator)
23 9005:0286:9005:028c Adaptec 2230S (Lancer) 21 9005:0286:9005:028c Adaptec 2230S (Lancer)
24 9005:0286:9005:028c Adaptec 2230SLP (Lancer) 22 9005:0286:9005:028c Adaptec 2230SLP (Lancer)
25 9005:0286:9005:028d Adaptec 2130S (Lancer) 23 9005:0286:9005:028d Adaptec 2130S (Lancer)
26 9005:0285:9005:028e Adaptec 2020SA (Skyhawk) 24 9005:0285:9005:028e Adaptec 2020SA (Skyhawk)
27 9005:0285:9005:028f Adaptec 2025SA (Terminator) 25 9005:0285:9005:028f Adaptec 2025SA (Terminator)
28 9005:0285:9005:0290 Adaptec 2410SA (Jaguar) 26 9005:0285:9005:0290 Adaptec 2410SA (Jaguar)
29 9005:0285:103c:3227 Adaptec 2610SA (Bearcat HP release) 27 9005:0285:103c:3227 Adaptec 2610SA (Bearcat HP release)
30 9005:0285:9005:0293 Adaptec 21610SA (Corsair-16) 28 9005:0285:9005:0293 Adaptec 21610SA (Corsair-16)
31 9005:0285:9005:0296 Adaptec 2240S (SabreExpress) 29 9005:0285:9005:0296 Adaptec 2240S (SabreExpress)
32 9005:0285:9005:0292 Adaptec 2810SA (Corsair-8) 30 9005:0285:9005:0292 Adaptec 2810SA (Corsair-8)
33 9005:0285:9005:0294 Adaptec Prowler 31 9005:0285:9005:0297 Adaptec 4005 (AvonPark)
34 9005:0285:9005:0297 Adaptec 4005SAS (AvonPark) 32 9005:0285:9005:0298 Adaptec 4000 (BlackBird)
35 9005:0285:9005:0298 Adaptec 4000SAS (BlackBird)
36 9005:0285:9005:0299 Adaptec 4800SAS (Marauder-X) 33 9005:0285:9005:0299 Adaptec 4800SAS (Marauder-X)
37 9005:0285:9005:029a Adaptec 4805SAS (Marauder-E) 34 9005:0285:9005:029a Adaptec 4805SAS (Marauder-E)
38 9005:0286:9005:029b Adaptec 2820SA (Intruder) 35 9005:0286:9005:029b Adaptec 2820SA (Intruder)
39 9005:0286:9005:029c Adaptec 2620SA (Intruder) 36 9005:0286:9005:029c Adaptec 2620SA (Intruder)
40 9005:0286:9005:029d Adaptec 2420SA (Intruder HP release) 37 9005:0286:9005:029d Adaptec 2420SA (Intruder HP release)
41 9005:0286:9005:02a2 Adaptec 3800SAS (Hurricane44) 38 9005:0286:9005:02ac Adaptec 1800 (Typhoon44)
42 9005:0286:9005:02a7 Adaptec 3805SAS (Hurricane80) 39 9005:0285:9005:02b5 Adaptec 5445 (Voodoo44)
43 9005:0286:9005:02a8 Adaptec 3400SAS (Hurricane40) 40 9005:0285:9005:02b6 Adaptec 5805 (Voodoo80)
44 9005:0286:9005:02ac Adaptec 1800SAS (Typhoon44) 41 9005:0285:9005:02b7 Adaptec 5085 (Voodoo08)
45 9005:0286:9005:02b3 Adaptec 2400SAS (Hurricane40lm) 42 9005:0285:9005:02bb Adaptec 3405 (Marauder40LP)
46 9005:0285:9005:02b5 Adaptec ASR5800 (Voodoo44) 43 9005:0285:9005:02bc Adaptec 3805 (Marauder80LP)
47 9005:0285:9005:02b6 Adaptec ASR5805 (Voodoo80) 44 9005:0285:9005:02c7 Adaptec 3085 (Marauder08ELP)
48 9005:0285:9005:02b7 Adaptec ASR5808 (Voodoo08) 45 9005:0285:9005:02bd Adaptec 31205 (Marauder120)
46 9005:0285:9005:02be Adaptec 31605 (Marauder160)
47 9005:0285:9005:02c3 Adaptec 51205 (Voodoo120)
48 9005:0285:9005:02c4 Adaptec 51605 (Voodoo160)
49 1011:0046:9005:0364 Adaptec 5400S (Mustang) 49 1011:0046:9005:0364 Adaptec 5400S (Mustang)
50 1011:0046:9005:0365 Adaptec 5400S (Mustang)
51 9005:0287:9005:0800 Adaptec Themisto (Jupiter) 50 9005:0287:9005:0800 Adaptec Themisto (Jupiter)
52 9005:0200:9005:0200 Adaptec Themisto (Jupiter) 51 9005:0200:9005:0200 Adaptec Themisto (Jupiter)
53 9005:0286:9005:0800 Adaptec Callisto (Jupiter) 52 9005:0286:9005:0800 Adaptec Callisto (Jupiter)
@@ -68,21 +67,32 @@ Supported Cards/Chipsets
68 9005:0285:17aa:0287 Legend S230 (Vulcan) 67 9005:0285:17aa:0287 Legend S230 (Vulcan)
69 9005:0285:9005:0290 IBM ServeRAID 7t (Jaguar) 68 9005:0285:9005:0290 IBM ServeRAID 7t (Jaguar)
70 9005:0285:1014:02F2 IBM ServeRAID 8i (AvonPark) 69 9005:0285:1014:02F2 IBM ServeRAID 8i (AvonPark)
71 9005:0285:1014:0312 IBM ServeRAID 8i (AvonParkLite)
72 9005:0286:1014:9540 IBM ServeRAID 8k/8k-l4 (AuroraLite) 70 9005:0286:1014:9540 IBM ServeRAID 8k/8k-l4 (AuroraLite)
73 9005:0286:1014:9580 IBM ServeRAID 8k/8k-l8 (Aurora) 71 9005:0286:1014:9580 IBM ServeRAID 8k/8k-l8 (Aurora)
74 9005:0286:1014:034d IBM ServeRAID 8s (Hurricane) 72 9005:0285:1014:034d IBM ServeRAID 8s (Marauder-E)
75 9005:0286:9005:029e ICP ICP9024R0 (Lancer) 73 9005:0286:9005:029e ICP ICP9024RO (Lancer)
76 9005:0286:9005:029f ICP ICP9014R0 (Lancer) 74 9005:0286:9005:029f ICP ICP9014RO (Lancer)
77 9005:0286:9005:02a0 ICP ICP9047MA (Lancer) 75 9005:0286:9005:02a0 ICP ICP9047MA (Lancer)
78 9005:0286:9005:02a1 ICP ICP9087MA (Lancer) 76 9005:0286:9005:02a1 ICP ICP9087MA (Lancer)
79 9005:0286:9005:02a3 ICP ICP5445AU (Hurricane44) 77 9005:0285:9005:02a4 ICP ICP9085LI (Marauder-X)
80 9005:0286:9005:02a4 ICP ICP9085LI (Marauder-X) 78 9005:0285:9005:02a5 ICP ICP5085BR (Marauder-E)
81 9005:0286:9005:02a5 ICP ICP5085BR (Marauder-E)
82 9005:0286:9005:02a6 ICP ICP9067MA (Intruder-6) 79 9005:0286:9005:02a6 ICP ICP9067MA (Intruder-6)
83 9005:0286:9005:02a9 ICP ICP5085AU (Hurricane80) 80 9005:0285:9005:02b2 ICP (Voodoo 8 internal 8 external)
84 9005:0286:9005:02aa ICP ICP5045AU (Hurricane40) 81 9005:0285:9005:02b8 ICP ICP5445SL (Voodoo44)
85 9005:0286:9005:02b4 ICP ICP5045AL (Hurricane40lm) 82 9005:0285:9005:02b9 ICP ICP5085SL (Voodoo80)
83 9005:0285:9005:02ba ICP ICP5805SL (Voodoo08)
84 9005:0285:9005:02bf ICP ICP5045BL (Marauder40LP)
85 9005:0285:9005:02c0 ICP ICP5085BL (Marauder80LP)
86 9005:0285:9005:02c8 ICP ICP5805BL (Marauder08ELP)
87 9005:0285:9005:02c1 ICP ICP5125BR (Marauder120)
88 9005:0285:9005:02c2 ICP ICP5165BR (Marauder160)
89 9005:0285:9005:02c5 ICP ICP5125SL (Voodoo120)
90 9005:0285:9005:02c6 ICP ICP5165SL (Voodoo160)
91 9005:0286:9005:02ab (Typhoon40)
92 9005:0286:9005:02ad (Aurora ARK)
93 9005:0286:9005:02ae (Aurora Lite ARK)
94 9005:0285:9005:02b0 (Sunrise Lake ARK)
95 9005:0285:9005:02b1 Adaptec (Voodoo 8 internal 8 external)
86 96
87People 97People
88------------------------- 98-------------------------