diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 17:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 17:00:33 -0400 |
| commit | eedf2c5296a8dfaaf9aec1a938c1d3bd73159a30 (patch) | |
| tree | a02e5ef1f2ae46c6328a6744e806c9e7dbff7327 /arch/x86/include/asm/ptrace-abi.h | |
| parent | 0151f94f2e61c39858e714a5d92244b0e5a7fdf5 (diff) | |
| parent | df52092f3c97788592ef72501a43fb7ac6a3cfe0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30
* git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30:
fastboot: remove duplicate unpack_to_rootfs()
ide/net: flip the order of SATA and network init
async: remove the temporary (2.6.29) "async is off by default" code
Fix up conflicts in init/initramfs.c manually
Diffstat (limited to 'arch/x86/include/asm/ptrace-abi.h')
0 files changed, 0 insertions, 0 deletions