Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
card	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
core	mmc: sdio: fix runtime PM anomalies by introducing MMC_CAP_POWER_OFF_CARD	2010-11-19 17:07:01 -05:00
host	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
Kconfig	mmc: explicitly mention SDIO support in Kconfig	2008-10-12 11:04:36 +02:00
Makefile	mmc: Makefile: Fix EXTRA_CFLAGS assignment	2010-10-23 21:11:15 +08:00