From: Tony Lindgren <tony@atomide.com>
Date: Thu, 17 Apr 2008 21:05:37 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e015fc7dba8f5002daa0982eb81d33cc72e68e95;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/mmc/host/omap.c
---

e015fc7dba8f5002daa0982eb81d33cc72e68e95
diff --cc drivers/mmc/host/omap.c
index 6e4896397fe,90c358b57d1..b6407ac0753
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@@ -1660,5 -1274,5 +1661,5 @@@ module_exit(mmc_omap_exit)
  
  MODULE_DESCRIPTION("OMAP Multimedia Card driver");
  MODULE_LICENSE("GPL");
- MODULE_ALIAS(DRIVER_NAME);
+ MODULE_ALIAS("platform:" DRIVER_NAME);
 -MODULE_AUTHOR("Juha Yrjölä");
 +MODULE_AUTHOR("Juha Yrj�l�");