diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 12:25:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 12:25:39 -0700 |
commit | 57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f (patch) | |
tree | 23fc946678d2d4bce1b74caab057333b433da150 /arch/sparc/include/asm/ptrace.h | |
parent | Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 (diff) | |
parent | x86: Make Dell Latitude E6420 use reboot=pci (diff) | |
download | linux-dev-57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f.tar.xz linux-dev-57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Make Dell Latitude E6420 use reboot=pci
x86: Make Dell Latitude E5420 use reboot=pci
Diffstat (limited to 'arch/sparc/include/asm/ptrace.h')
0 files changed, 0 insertions, 0 deletions