diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-16 11:26:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-16 11:26:33 -0700 |
| commit | f469461df6ff822f71b8737bda86eea20f16ff93 (patch) | |
| tree | d7605dd5846725ed6949621084a5652782d9b02d /drivers/auxdisplay/ks0108.c | |
| parent | 79140bc486fac016249f3d1d67ec9a39ebed9ad9 (diff) | |
| parent | 44a54f787c0abcf75a2ed49b8ec8b2b512468f73 (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:
tracing: Add alignment to syscall metadata declarations
perf: Sync callchains with period based hits
perf: Resurrect flat callchains
perf: Version String fix, for fallback if not from git
perf: Version String fix, using kernel version
Diffstat (limited to 'drivers/auxdisplay/ks0108.c')
0 files changed, 0 insertions, 0 deletions