summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 01:01:58 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 01:01:58 +0100
commiteb1c838fca2248ae62e5472b496ab52d3d774cc5 (patch)
treedc1e70881e0048fc67131f009e25a1aaece60901 /Makefile
parentRevert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-... (diff)
parentsparc64: Fix Niagara2 perf event handling. (diff)
downloadlinux-eb1c838fca2248ae62e5472b496ab52d3d774cc5.tar.xz
linux-eb1c838fca2248ae62e5472b496ab52d3d774cc5.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix Niagara2 perf event handling. sparc64: Fix NMI programming when perf events are active. bbc_envctrl: Clean up properly if kthread_run() fails.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions