commit | 36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 15 15:20:17 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 15 15:20:17 2009 -0700 |
tree | 99e0c131153d2f8126b6bd64e9a2a0e4e68216a0 | |
parent | 21279cfa107af07ef985539ac0de2152b9cba5f5 [diff] | |
parent | db8590f5043f3436a65b24155a3a7af2604df876 [diff] |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: Revert "x86: linker script syntax nits" x86, perf_event: Rename 'performance counter interrupt'