diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 11:12:15 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 11:12:15 -0800 |
commit | 5b39dba5029108800b94a5f4f96e3a05417103ac (patch) | |
tree | 7d5c59fd124a776508b3e2a58efb093cd97b29ea /net/ipv4/esp4.c | |
parent | 11eb3b0da3f8e4b9a6da6aba510471918239153d (diff) | |
parent | 882c49164d72c45f37d7fa1bb3de7c31cf1a5fab (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: extend ricoh_mmc to support Ricoh RL5c476
at91_mci: use generic GPIO calls
sdhci: add num index for multi controllers case
MAINTAINERS: remove non-existant URLs
mmc: remove sdhci and mmc_spi experimental markers
mmc: Handle suspend/resume in Ricoh MMC disabler
Diffstat (limited to 'net/ipv4/esp4.c')
0 files changed, 0 insertions, 0 deletions