Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next

Conflicts:
	drivers/video/omap2/dss/core.c
	drivers/video/omap2/dss/dispc.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index 43324e5ed25f..b337a8469fd8 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -52,7 +52,7 @@ config OMAP2_DSS_RFBI
           DBI is a bus between the host processor and a peripheral,
           such as a display or a framebuffer chip.
 
-          See http://www.mipi.org/ for DBI spesifications.
+          See http://www.mipi.org/ for DBI specifications.
 
 config OMAP2_DSS_VENC
         bool "VENC support"
@@ -92,7 +92,7 @@ config OMAP2_DSS_DSI
           DSI is a high speed half-duplex serial interface between the host
           processor and a peripheral, such as a display or a framebuffer chip.
 
-          See http://www.mipi.org/ for DSI spesifications.
+          See http://www.mipi.org/ for DSI specifications.
 
 config OMAP2_DSS_MIN_FCK_PER_PCK
         int "Minimum FCK/PCK ratio (for scaling)"