| commit | 9a457a524762edc1bb1ded65b7a75c01738632d5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 27 12:26:33 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 27 12:26:33 2010 -0700 |
| tree | 19b8b7584abd26f1b3d2390fd5523af0182fad42 | |
| parent | bc5fbd9cc8b72ea591557c1277237a43c65ce775 [diff] | |
| parent | 40d24ff9b4309d37999bc0ae91a271f57651d9dd [diff] |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: pd6729: Fix error path pcmcia: preserve configuration information if request_io fails partly