diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-04-27 05:11:07 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-27 05:11:07 -0400 |
| commit | 846bcf3923056965c3fc0c9ba811c10d25af75e5 (patch) | |
| tree | c39bd4273a006da2fb1f727ebb7eb1108f5526c8 /Documentation | |
| parent | 863c3ad87b10617464fc52c21fc7e31987910559 (diff) | |
| parent | 3e7ad8ed979ce9e3ad897dd87c50bf577966f89c (diff) | |
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y
into rt/2.6.33
Conflicts:
Makefile
arch/x86/include/asm/rwsem.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/i2c/busses/i2c-i801 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801 index 81c0c59a60ea..e1bb5b261693 100644 --- a/Documentation/i2c/busses/i2c-i801 +++ b/Documentation/i2c/busses/i2c-i801 | |||
| @@ -15,7 +15,8 @@ Supported adapters: | |||
| 15 | * Intel 82801I (ICH9) | 15 | * Intel 82801I (ICH9) |
| 16 | * Intel EP80579 (Tolapai) | 16 | * Intel EP80579 (Tolapai) |
| 17 | * Intel 82801JI (ICH10) | 17 | * Intel 82801JI (ICH10) |
| 18 | * Intel PCH | 18 | * Intel 3400/5 Series (PCH) |
| 19 | * Intel Cougar Point (PCH) | ||
| 19 | Datasheets: Publicly available at the Intel website | 20 | Datasheets: Publicly available at the Intel website |
| 20 | 21 | ||
| 21 | Authors: | 22 | Authors: |