diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 16:14:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 16:14:14 +0100 |
| commit | 49b766ec12650db38e98caafa3cd94e8ff59000c (patch) | |
| tree | be70876001af55af3759f117c4bded2b267315bf /drivers/net/enc28j60_hw.h | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | pcmcia: do not load the pd6729 driver if io_base is NULL (diff) | |
| download | linux-49b766ec12650db38e98caafa3cd94e8ff59000c.tar.xz linux-49b766ec12650db38e98caafa3cd94e8ff59000c.zip | |
Merge branch 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: do not load the pd6729 driver if io_base is NULL
pcmcia: Fix possible printk format warnings
pcmcia: do not try to store more than 4 version strings
pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup
pcmcia: properly close previous dev_printk if kzalloc fails in do_io_probe
pcmcia: fix controller printk format warnings
Diffstat (limited to 'drivers/net/enc28j60_hw.h')
0 files changed, 0 insertions, 0 deletions