summaryrefslogtreecommitdiff
path: root/arch/x86/oprofile/nmi_int.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-29 18:18:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-29 18:18:48 -0700
commitca56a95eedcc95f8fea7b49c87565cd961d74fe2 (patch)
treeef49dbbd1a38b4511c91108764740448f8744c39 /arch/x86/oprofile/nmi_int.c
parent0e47427bc50bd34bd405e207ccf5235f3b78b551 (diff)
parentb271a988eb9c3944c50fb62c21ac61860090d3ba (diff)
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: increase rom size for atrm method
Diffstat (limited to 'arch/x86/oprofile/nmi_int.c')
0 files changed, 0 insertions, 0 deletions