projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 571020d 33619f0)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Feb 2011 17:26:54 +0000 (09:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Feb 2011 17:26:54 +0000 (09:26 -0800)
commitd8204a37baf5474d3154eb536c936369be2bd5c0
treeeb598882870e1e21356a015a3634c5b68fc75e6atree
parent571020df6fae18623498d70d3f2331d9eb7ad2becommit | diff
parent33619f0d3ff715a2a5499520967d526ad931d70dcommit | diff
Merge branch 'urgent' of git://git./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
MicroBlaze GIT Repository