aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 16:29:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 16:29:18 -0700
commitfafa3a3f16723997f039a0193997464d66dafd8f (patch)
treedd7e93c8bde2b8ac8ec67f3f8302f8ddf4ec9c43 /Makefile
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentx86: fix TSC build error on 32bit (diff)
downloadlinux-dev-fafa3a3f16723997f039a0193997464d66dafd8f.tar.xz
linux-dev-fafa3a3f16723997f039a0193997464d66dafd8f.zip
Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix TSC build error on 32bit
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions