aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-19 09:42:40 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-19 09:42:40 +0100
commit30cd324e9787ccc9a5ede59742d5409857550692 (patch)
treee53027e0283119de0ef4c3a431b1d20cd43003fb /block
parentc71dd42db2c6f1637b92502a214587431c1a6ad2 (diff)
parent6d102bc68f3dd2ae0e305b09170b1751aa67baeb (diff)
parent3d9101e92529e1ff6014f95a69afc82f37b9b13a (diff)
downloadlinux-2.6.34-ux500-30cd324e9787ccc9a5ede59742d5409857550692.tar.gz
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core
Conflicts: include/linux/ftrace.h