aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-05 16:01:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-05 16:01:58 -0800
commiteb1c838fca2248ae62e5472b496ab52d3d774cc5 (patch)
treedc1e70881e0048fc67131f009e25a1aaece60901 /Makefile
parentdb677ffa5f5a4f15b9dad4d132b3477b80766d82 (diff)
parente04ed38d4e0cd32141f723560efcc8252b0241e2 (diff)
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