diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /Documentation/i2c/busses | |
parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'Documentation/i2c/busses')
-rw-r--r-- | Documentation/i2c/busses/i2c-ali1535 | 2 | ||||
-rw-r--r-- | Documentation/i2c/busses/i2c-ali1563 | 2 | ||||
-rw-r--r-- | Documentation/i2c/busses/i2c-ali15x3 | 2 | ||||
-rw-r--r-- | Documentation/i2c/busses/i2c-piix4 | 2 | ||||
-rw-r--r-- | Documentation/i2c/busses/i2c-sis630 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/i2c/busses/i2c-ali1535 b/Documentation/i2c/busses/i2c-ali1535 index acbc65a08097..5d46342e486a 100644 --- a/Documentation/i2c/busses/i2c-ali1535 +++ b/Documentation/i2c/busses/i2c-ali1535 | |||
@@ -3,7 +3,7 @@ Kernel driver i2c-ali1535 | |||
3 | Supported adapters: | 3 | Supported adapters: |
4 | * Acer Labs, Inc. ALI 1535 (south bridge) | 4 | * Acer Labs, Inc. ALI 1535 (south bridge) |
5 | Datasheet: Now under NDA | 5 | Datasheet: Now under NDA |
6 | http://www.ali.com.tw/eng/support/datasheet_request.php | 6 | http://www.ali.com.tw/ |
7 | 7 | ||
8 | Authors: | 8 | Authors: |
9 | Frodo Looijaard <frodol@dds.nl>, | 9 | Frodo Looijaard <frodol@dds.nl>, |
diff --git a/Documentation/i2c/busses/i2c-ali1563 b/Documentation/i2c/busses/i2c-ali1563 index 54691698d2dd..41b1a077e4c7 100644 --- a/Documentation/i2c/busses/i2c-ali1563 +++ b/Documentation/i2c/busses/i2c-ali1563 | |||
@@ -3,7 +3,7 @@ Kernel driver i2c-ali1563 | |||
3 | Supported adapters: | 3 | Supported adapters: |
4 | * Acer Labs, Inc. ALI 1563 (south bridge) | 4 | * Acer Labs, Inc. ALI 1563 (south bridge) |
5 | Datasheet: Now under NDA | 5 | Datasheet: Now under NDA |
6 | http://www.ali.com.tw/eng/support/datasheet_request.php | 6 | http://www.ali.com.tw/ |
7 | 7 | ||
8 | Author: Patrick Mochel <mochel@digitalimplant.org> | 8 | Author: Patrick Mochel <mochel@digitalimplant.org> |
9 | 9 | ||
diff --git a/Documentation/i2c/busses/i2c-ali15x3 b/Documentation/i2c/busses/i2c-ali15x3 index 600da90b8f12..42888d8ac124 100644 --- a/Documentation/i2c/busses/i2c-ali15x3 +++ b/Documentation/i2c/busses/i2c-ali15x3 | |||
@@ -3,7 +3,7 @@ Kernel driver i2c-ali15x3 | |||
3 | Supported adapters: | 3 | Supported adapters: |
4 | * Acer Labs, Inc. ALI 1533 and 1543C (south bridge) | 4 | * Acer Labs, Inc. ALI 1533 and 1543C (south bridge) |
5 | Datasheet: Now under NDA | 5 | Datasheet: Now under NDA |
6 | http://www.ali.com.tw/eng/support/datasheet_request.php | 6 | http://www.ali.com.tw/ |
7 | 7 | ||
8 | Authors: | 8 | Authors: |
9 | Frodo Looijaard <frodol@dds.nl>, | 9 | Frodo Looijaard <frodol@dds.nl>, |
diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4 index ac540c71c7eb..475bb4ae0720 100644 --- a/Documentation/i2c/busses/i2c-piix4 +++ b/Documentation/i2c/busses/i2c-piix4 | |||
@@ -97,4 +97,4 @@ of all affected systems, so the only safe solution was to prevent access to | |||
97 | the SMBus on all IBM systems (detected using DMI data.) | 97 | the SMBus on all IBM systems (detected using DMI data.) |
98 | 98 | ||
99 | For additional information, read: | 99 | For additional information, read: |
100 | http://www.lm-sensors.org/browser/lm-sensors/trunk/README.thinkpad | 100 | http://www.lm-sensors.org/browser/lm-sensors/trunk/README |
diff --git a/Documentation/i2c/busses/i2c-sis630 b/Documentation/i2c/busses/i2c-sis630 index 629ea2c356fd..0b9697366930 100644 --- a/Documentation/i2c/busses/i2c-sis630 +++ b/Documentation/i2c/busses/i2c-sis630 | |||
@@ -2,7 +2,7 @@ Kernel driver i2c-sis630 | |||
2 | 2 | ||
3 | Supported adapters: | 3 | Supported adapters: |
4 | * Silicon Integrated Systems Corp (SiS) | 4 | * Silicon Integrated Systems Corp (SiS) |
5 | 630 chipset (Datasheet: available at http://amalysh.bei.t-online.de/docs/SIS/) | 5 | 630 chipset (Datasheet: available at http://www.sfr-fresh.com/linux) |
6 | 730 chipset | 6 | 730 chipset |
7 | * Possible other SiS chipsets ? | 7 | * Possible other SiS chipsets ? |
8 | 8 | ||