summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-22 18:26:54 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-22 18:26:54 +0100
commitd8204a37baf5474d3154eb536c936369be2bd5c0 (patch)
treeeb598882870e1e21356a015a3634c5b68fc75e6a /drivers/i2c
parentMerge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentpcmcia: re-enable Zoomed Video support (diff)
downloadlinux-d8204a37baf5474d3154eb536c936369be2bd5c0.tar.xz
linux-d8204a37baf5474d3154eb536c936369be2bd5c0.zip
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: re-enable Zoomed Video support cm4000_cs: Fix undefined ops warning pcmcia vs. MECR on pxa25x/sa1111 drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region
Diffstat (limited to 'drivers/i2c')
0 files changed, 0 insertions, 0 deletions