diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:53:01 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:53:01 +0200 |
commit | 046fd53773cd87125f799b00422e487bf1428d38 (patch) | |
tree | f379644e8ef8a1ce3ac09802794bd19c854265a6 | |
parent | drivers/mmc/card/block.c: fix refcount leak in mmc_block_open() (diff) | |
parent | x86, tracehook: clean up implementation of syscall_get_error() (diff) | |
parent | Merge branch 'x86/cpu' into x86/xsave (diff) | |
parent | Merge commit 'v2.6.27-rc3' into x86/prototypes (diff) | |
download | linux-046fd53773cd87125f799b00422e487bf1428d38.tar.xz linux-046fd53773cd87125f799b00422e487bf1428d38.zip |
Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>