From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Jul 2010 23:27:34 +0000 (-0700)
Subject: Merge branch 'linuxdocs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap... 
X-Git-Tag: v2.6.35-rc6~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83ba37105e262d374b9092a572b8ee6e30aa9f70;p=profile%2Fivi%2Fkernel-x86-ivi.git

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)
---

83ba37105e262d374b9092a572b8ee6e30aa9f70