Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/mmc/host/omap.c

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/mmc/host/omap.c
index 6e48963,90c358b..b6407ac
--- 1/drivers/mmc/host/omap.c
--- 2/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�");

diff --cc drivers/net/smc91x.c
Simple merge