diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:34:17 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:34:17 +0400 |
| commit | 7c6d87ac843bfbc5a7669736882a0e88c217a820 (patch) | |
| tree | b757687fcc7493a322c5c27aa141c87668900234 /drivers/net/pcmcia/com20020_cs.c | |
| parent | a0fe3cc5d36a5f5b4f60abfe1a4b1caf4a5cce5a (diff) | |
| parent | ec66841e495b9ab4f92bdf91efe8cf56e1471fbd (diff) | |
| download | linux-7c6d87ac843bfbc5a7669736882a0e88c217a820.tar.xz | |
Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6
* 'viafb-next' of git://git.lwn.net/linux-2.6: (35 commits)
viafb: move some include files to include/linux
viafb: Eliminate some global.h references
viafb: get rid of i2c debug cruft
viafb: fold via_io.h into via-core.h
viafb: Fix initialization error paths
viafb: Do not remove gpiochip under spinlock
viafb: make procfs entries optional
viafb: fix proc entry removal
viafb: improve misc register handling
viafb: replace inb/outb
viafb: move some modesetting functions to a seperate file
viafb: unify modesetting functions
viafb: Reserve framebuffer memory for the upcoming camera driver
viafb: Add a simple VX855 DMA engine driver
viafb: Add a simple interrupt management infrastructure
via: Rationalize vt1636 detection
viafb: Introduce viafb_find_i2c_adapter()
via: Do not attempt I/O on inactive I2C adapters
viafb: Turn GPIO and i2c into proper platform devices
viafb: Convert GPIO and i2c to the new indexed port ops
...
Diffstat (limited to 'drivers/net/pcmcia/com20020_cs.c')
0 files changed, 0 insertions, 0 deletions