diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 12:48:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 12:48:36 -0700 |
| commit | f900e5824a44ab65437b4f7e7c610b72f94820c5 (patch) | |
| tree | 770015a763e4c87e807e00a467a4ca602f242363 /drivers/pcmcia/pcmcia_resource.c | |
| parent | 23344cb341902f4e3431d8137dca93d6e186d054 (diff) | |
| parent | 856d08ec46c5ecf3df13827c492fb6998fdc8322 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
* master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
[PATCH] powerpc: iSeries needs slb_initialize to be called
powerpc: hook up the splice syscall
[PATCH] powerpc/cell: compile fixes
[PATCH] powerpc: trivial spelling fixes in fault.c
[PATCH] powerpc/pseries: EEH Cleanup
[PATCH] powerpc/pseries: misc lparcfg fixes
[PATCH] powerpc/pseries: fix device name printing, again.
[PATCH] powerpc: Extends HCALL interface for InfiniBand usage
[PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS
[PATCH] powerpc/pseries: print message if EEH recovery fails
[PATCH] powerpc/pseries: mutex lock to serialize EEH event processing
powerpc: converted embedded platforms to use new define_machine support
powerpc: merge machine_check_exception between ppc32 & ppc64
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
0 files changed, 0 insertions, 0 deletions