diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 15:31:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 15:31:02 -0700 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /Documentation/ia64 | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) | |
| download | linux-3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4.tar.gz linux-3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4.tar.bz2 linux-3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4.zip | |
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/ia64')
| -rw-r--r-- | Documentation/ia64/aliasing.txt | 2 | ||||
| -rw-r--r-- | Documentation/ia64/serial.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/ia64/aliasing.txt b/Documentation/ia64/aliasing.txt index aa3e953f0f7b..5a4dea6abebd 100644 --- a/Documentation/ia64/aliasing.txt +++ b/Documentation/ia64/aliasing.txt @@ -168,8 +168,6 @@ PAST PROBLEM CASES mmap of 0x0-0x9FFFF /dev/mem by "hwinfo" on HP sx1000 with VGA enabled - See https://bugzilla.novell.com/show_bug.cgi?id=140858. - The EFI memory map reports the following attributes: 0x00000-0x9FFFF WB only 0xA0000-0xBFFFF UC only (VGA frame buffer) diff --git a/Documentation/ia64/serial.txt b/Documentation/ia64/serial.txt index 040b9773209f..6869c73de4e2 100644 --- a/Documentation/ia64/serial.txt +++ b/Documentation/ia64/serial.txt @@ -133,7 +133,7 @@ TROUBLESHOOTING SERIAL CONSOLE PROBLEMS -[1] http://www.dig64.org/specifications/DIG64_PCDPv20.pdf +[1] http://www.dig64.org/specifications/agreement The table was originally defined as the "HCDP" for "Headless Console/Debug Port." The current version is the "PCDP" for "Primary Console and Debug Port Devices." |