diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-05 15:52:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-05 15:52:06 -0800 |
| commit | bf83c2a315637dee8a8b5c2221ce5030cc38c6db (patch) | |
| tree | fb477f3affea75fcc79fa9d7006415576f79aadb /mm/swap.c | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
| parent | 40a0017eb89c4c5a4bf81523edd867d730c9f143 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
[PATCH] pcmcia: at91_cf update
[PATCH] pcmcia: fix m32r_cfc.c compilation
[PATCH] pcmcia: ds.c debug enhancements
[PATCH] pcmcia: at91_cf update
[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation
[PATCH] pcmcia: remove prod_id indirection
[PATCH] pcmcia: remove manf_id and card_id indirection
[PATCH] pcmcia: IDs for Elan serial PCMCIA devcies
[PATCH] pcmcia: allow for four multifunction subdevices
[PATCH] pcmcia: handle __copy_from_user() return value in ioctl
[PATCH] pcmcia: multifunction card handling fixes
[PATCH] pcmcia: allow shared IRQs on pd6729 sockets
[PATCH] pcmcia: start over after CIS override
[PATCH] cm4000_cs: fix return value check
[PATCH] pcmcia: yet another IDE ID
[PATCH] pcmcia: Add an id to ide-cs.c
Diffstat (limited to 'mm/swap.c')
0 files changed, 0 insertions, 0 deletions