summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-13 23:05:03 +0300
committerIngo Molnar <mingo@elte.hu>2009-02-13 23:05:03 +0300
commit22796b15725488002437ebbf98a22fdbe596cf89 (patch)
treee6745c9e367e782c0b184eb941e2b86805975f88 /Makefile
parentbf33a70a73876b163d62612e9567cbac6604ba7e (diff)
parent0fb807c3e573ff9de2965ca38c907605d4735d16 (diff)
downloadlinux-22796b15725488002437ebbf98a22fdbe596cf89.tar.xz
Merge branch 'core/header-fixes' into x86/headers
Conflicts: arch/x86/include/asm/setup.h
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions