projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc5fbd9 40d24ff)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:26:33 +0000 (12:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:26:33 +0000 (12:26 -0700)
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: pd6729: Fix error path
  pcmcia: preserve configuration information if request_io fails partly


Trivial merge
Domain: System / Kernel;