diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 12:52:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 12:52:57 -0700 |
commit | ef5ddd3d591399f2c722a77bce543d20bef31663 (patch) | |
tree | a6bec12fcf1e7533cb8a972fc1b465923e46585c /arch/ia64/sn/kernel/sn2/sn_hwperf.c | |
parent | qeth: properly delete empty files. (diff) | |
parent | x86, setup: guard against pre-ACPI 3 e820 code not updating %ecx (diff) | |
download | linux-dev-ef5ddd3d591399f2c722a77bce543d20bef31663.tar.xz linux-dev-ef5ddd3d591399f2c722a77bce543d20bef31663.zip |
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, setup: guard against pre-ACPI 3 e820 code not updating %ecx
Diffstat (limited to 'arch/ia64/sn/kernel/sn2/sn_hwperf.c')
0 files changed, 0 insertions, 0 deletions