diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-07 14:11:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-07 14:11:09 -0700 |
| commit | 2c32b1dab508ccaa4aea1a9d6047b65fc708e929 (patch) | |
| tree | 7a97585278a6e5d49f0b969b8047918f4f5239c2 /net/tipc | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | pcmcia: fix compilation after 16bit state locking changes (diff) | |
| download | linux-dev-2c32b1dab508ccaa4aea1a9d6047b65fc708e929.tar.xz linux-dev-2c32b1dab508ccaa4aea1a9d6047b65fc708e929.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: fix compilation after 16bit state locking changes
pcmcia: order userspace suspend and resume requests
pcmcia: avoid pccard_validate_cis failure in resume callpath
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions