Merge branch 'linuxdocs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Jul 2010 23:27:34 +0000 (16:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Jul 2010 23:27:34 +0000 (16:27 -0700)
commit83ba37105e262d374b9092a572b8ee6e30aa9f70
tree57b05e00c8beab98bb8c0116fece95d4461efd83
parent516bd664153d76f5c814633cee6500e2ff8e861b
parent9fe41e4197f351bc78547ab2d8808e1aca30d87c
Merge branch 'linuxdocs' of git://git./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)