diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 18:10:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 18:10:03 -0700 |
| commit | 5c4c1489b93c9dc51cc6e97fd73e325ce94983c0 (patch) | |
| tree | 16dc1628d614b882bb36fa57bdc88b1d30a83711 /net/xfrm | |
| parent | c2e68052429fdf87702fccd272951282bef1c60a (diff) | |
| parent | 964f9ce2ff42dc47cf40fbd2f5c81cd60689e384 (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:
sdhci: make sure to clear the error interrupt
mmc: at91_mci: wakeup on card insertion (or removal)
mmc: add maintainer for at91
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions