summaryrefslogtreecommitdiffstats
path: root/scripts/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-22 20:05:19 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-22 20:05:19 +0100
commitfc6fc7f1b1095b92d4834e69b385b91e412a7ce5 (patch)
tree2ad451d5dac4d460830536944cef1de93be36b2a /scripts/Makefile
parentef1f87aa7ba6224bef1b750b3272ba281d8f43ed (diff)
parent770824bdc421ff58a64db608294323571c949f4c (diff)
downloadlinux-stable-fc6fc7f1b1095b92d4834e69b385b91e412a7ce5.tar.gz
linux-stable-fc6fc7f1b1095b92d4834e69b385b91e412a7ce5.tar.bz2
linux-stable-fc6fc7f1b1095b92d4834e69b385b91e412a7ce5.zip
Merge branch 'linus' into x86/apic
Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'scripts/Makefile')
0 files changed, 0 insertions, 0 deletions