q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/mmc
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
at91_mci.c mmc: constify mmc_host_ops vectors 2006-12-01 17:58:53 +01:00
au1xmmc.c mmc: constify mmc_host_ops vectors 2006-12-01 17:58:53 +01:00
au1xmmc.h
imxmmc.c mmc: constify mmc_host_ops vectors 2006-12-01 17:58:53 +01:00
imxmmc.h [ARM] 3457/1: i.MX: SD/MMC support for i.MX/MX1 2006-04-02 19:27:07 +01:00
Kconfig trivial change for mmc/Kconfig: MMC_PXA does not mean only PXA255 2006-12-01 18:06:36 +01:00
Makefile [PATCH] mmc: driver for TI FlashMedia card reader - Kconfig/Makefile 2006-10-04 07:55:14 -07:00
mmc.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
mmc.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
mmc_block.c mmc: correct request error handling 2006-12-01 19:06:19 +01:00
mmc_queue.c Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc 2006-12-02 08:29:04 -08:00
mmc_queue.h mmc: remove kernel_thread() 2006-12-01 17:56:46 +01:00
mmc_sysfs.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
mmci.c mmc: constify mmc_host_ops vectors 2006-12-01 17:58:53 +01:00
mmci.h [MMC] mmci: kunmap_atomic() unmaps virtual address, not page 2006-01-05 10:31:23 +00:00
omap.c Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc 2006-12-02 08:29:04 -08:00
pxamci.c mmc: constify mmc_host_ops vectors 2006-12-01 17:58:53 +01:00
pxamci.h
sdhci.c mmc: sdhci high speed support 2006-12-01 18:54:10 +01:00
sdhci.h mmc: sdhci high speed support 2006-12-01 18:54:10 +01:00
tifm_sd.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
wbsd.c Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc 2006-12-02 08:29:04 -08:00
wbsd.h [PATCH] mmc (mainly): add "or later" clause to licence statement. 2006-10-01 00:39:23 -07:00