Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux

[cascardo/linux.git] / Documentation / media-framework.txt

diff --git a/Documentation/media-framework.txt b/Documentation/media-framework.txt
index 77bd0a4..eeced24 100644 (file)
--- a/Documentation/media-framework.txt
+++ b/Documentation/media-framework.txt
@@ -18,7 +18,7 @@ Abstract media device model
 
 Discovering a device internal topology, and configuring it at runtime, is one
 of the goals of the media framework. To achieve this, hardware devices are
-modeled as an oriented graph of building blocks called entities connected
+modelled as an oriented graph of building blocks called entities connected
 through pads.
 
 An entity is a basic media hardware building block. It can correspond to