Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2010-09-27 12:26:33 -07:00

parent bc5fbd9cc8 40d24ff9b4

commit 9a457a5247

2 changed files with 7 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

drivers/pcmcia/pcmcia_resource.c

View file

2

drivers/pcmcia/pd6729.c

View file