黄涛 b2be450f10 Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb ... Conflicts: include/net/cfg80211.h		2012-08-21 14:14:24 +08:00
..
block.c	Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb	2012-08-21 14:14:24 +08:00
Kconfig	mmc: mmcblk: Add support for deferred SD bus resume	2011-06-14 09:08:52 -07:00
Makefile	mmc: Makefile: Fix EXTRA_CFLAGS assignment	2010-10-23 21:11:15 +08:00
mmc_test.c	mmc: mmc_test: minor clean up, use t = &test.area everywhere	2011-05-24 23:53:49 -04:00
queue.c	mmc: queue: bring discard_granularity/alignment into line with SCSI	2011-06-25 18:53:05 -04:00
queue.h	mmc: queue: append partition subname to queue thread name	2011-06-25 18:52:57 -04:00
sdio_uart.c	tiocmset: kill the file pointer argument	2011-02-17 11:52:43 -08:00