| commit | d8204a37baf5474d3154eb536c936369be2bd5c0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 22 09:26:54 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 22 09:26:54 2011 -0800 |
| tree | eb598882870e1e21356a015a3634c5b68fc75e6a | |
| parent | 571020df6fae18623498d70d3f2331d9eb7ad2be [diff] | |
| parent | 33619f0d3ff715a2a5499520967d526ad931d70d [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: 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