aboutsummaryrefslogtreecommitdiff
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-24 10:37:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-24 10:37:51 -0800
commit90ea301916688d010862395b00817f3c1c8e09a4 (patch)
tree2c10f7c44daa1d4176777907aa802f4aa9624ef5 /kernel/trace/trace.c
parentb8be634e01b400fa2528848ad0cd6a5580a15bc4 (diff)
parent4927fbf11dc1057cd9c94dd40358e5f98c999311 (diff)
Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux: i2c: imx: call ioremap only after request_mem_region i2c: mxc: let time to generate stop bit
Diffstat (limited to 'kernel/trace/trace.c')
0 files changed, 0 insertions, 0 deletions