summaryrefslogtreecommitdiff
path: root/security/integrity
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-03 11:51:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-03 11:51:22 -0800
commit03ed6a3aa600c48593c3984812fda2d5945ddb46 (patch)
tree03d1357411424514943deffadbb9f287288998bd /security/integrity
parent4c37a4b53de2d08c469a6e4304cf2a17178200aa (diff)
parenta0a2b71bb750ffe9b3faa317cb6317f4ad109383 (diff)
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Fix callchain hit bad cast on ascii display arch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU watchdog: Improve initialisation error message and documentation
Diffstat (limited to 'security/integrity')
0 files changed, 0 insertions, 0 deletions