diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-19 03:00:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 03:00:35 -0500 |
| commit | 72c26c9a26ea7f2f3d14f162c2ebb07805f724ea (patch) | |
| tree | bf1b4bc0b69f96c79474f9edb9cf0e811c95f2dc /Documentation/ABI | |
| parent | 37bd824a35a60abc73e5fa8816bd5f50c913d69b (diff) | |
| parent | ba95fd47d177d46743ad94055908d22840370e06 (diff) | |
Merge branch 'linus' into tracing/blktrace
Conflicts:
block/blktrace.c
Semantic merge:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/ABI')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-firmware-memmap | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-firmware-memmap b/Documentation/ABI/testing/sysfs-firmware-memmap index 0d99ee6ae02..eca0d65087d 100644 --- a/Documentation/ABI/testing/sysfs-firmware-memmap +++ b/Documentation/ABI/testing/sysfs-firmware-memmap | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | What: /sys/firmware/memmap/ | 1 | What: /sys/firmware/memmap/ |
| 2 | Date: June 2008 | 2 | Date: June 2008 |
| 3 | Contact: Bernhard Walle <bwalle@suse.de> | 3 | Contact: Bernhard Walle <bernhard.walle@gmx.de> |
| 4 | Description: | 4 | Description: |
| 5 | On all platforms, the firmware provides a memory map which the | 5 | On all platforms, the firmware provides a memory map which the |
| 6 | kernel reads. The resources from that memory map are registered | 6 | kernel reads. The resources from that memory map are registered |