| commit | 833961d81f0ece46b7884f988cc65509e2c49646 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 26 15:10:13 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 26 15:10:13 2010 -0700 |
| tree | 4c4bef2e8ec7d8510de827d83010b0fe76c4924f | |
| parent | 3cacf42462c8c97e045a07a5fc92aa357489c8b5 [diff] | |
| parent | 2271048d1b3b0aabf83d25b29c20646dcabedc05 [diff] |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ring-buffer: Do 8 byte alignment for 64 bit that can not handle 4 byte align