diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 12:43:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 12:43:21 -0400 |
commit | cb6aef2879b769644b35cffe9844c81c63809c8e (patch) | |
tree | ccaab997f764e155226da1b600dabbe0b65f4ad7 /include/asm-parisc/emergency-restart.h | |
parent | 950709a8961e2dde05bc55dca29b2d2e54a6d3ec (diff) | |
parent | 48b950ff241fca03a6969a5eb6a42a02722678d4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
[PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cards
[PATCH] vrc4171: update config
[PATCH] pcmcia: fix oops in static mapping case
[PATCH] pcmcia: remove unneeded forward declarations
[PATCH] pcmcia: do not set dev_node to NULL too early
[PATCH] pcmcia: fix comment for pcmcia_load_firmware
[PATCH] pcmcia: unload second device first
[PATCH] pcmcia: add new ID to pcnet_cs
Diffstat (limited to 'include/asm-parisc/emergency-restart.h')
0 files changed, 0 insertions, 0 deletions