diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 16:55:21 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 16:55:21 (GMT) |
| commit | f1f6ea352257e0df33cf0184ba777c293cb6f1d6 (patch) | |
| tree | bff9547a1f45db619848c5de62033cb48e61c73b /drivers/net/e1000 | |
| parent | 63c70a0d7b59bac08bd14cd24c36f76aafc25de6 (diff) | |
| parent | b83156b52dd77979cc93bafc2283929532f6f7d0 (diff) | |
| download | linux-f1f6ea352257e0df33cf0184ba777c293cb6f1d6.tar.xz | |
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: avoid validate_cis failure on CIS override
pcmcia: dev_node removal bugfix
pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI
pcmcia: only keep saved I365_CSCINT flag if there is no PCI irq
Diffstat (limited to 'drivers/net/e1000')
0 files changed, 0 insertions, 0 deletions