tree 57b05e00c8beab98bb8c0116fece95d4461efd83
parent 516bd664153d76f5c814633cee6500e2ff8e861b
parent 9fe41e4197f351bc78547ab2d8808e1aca30d87c
author Linus Torvalds <torvalds@linux-foundation.org> 1279668454 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279668454 -0700

Merge branch 'linuxdocs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs

* 'linuxdocs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
  documentation: fix almost duplicate filenames (IO/io-mapping.txt)