Merge commit 'gcl/next' into next

2009-12-09 17:10:22 +11:00
parent 51badebdcf 6d5355998a
commit 8c82da5e24
17 changed files with 1609 additions and 320 deletions
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -22,6 +22,8 @@
 #include <linux/mmc/core.h>
 #include <linux/mmc/host.h>

+MODULE_LICENSE("GPL");
+
 enum {
 	CD_GPIO = 0,
 	WP_GPIO,