summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-30 00:23:28 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-30 00:23:28 +0200
commita2dccdb2055abeb8a7ce8e45e5f83de9c980a00c (patch)
tree14b0997d648a158e05fa2243b1beddaa6d4cfd36 /fs
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff)
parent[S390] etr: fix clock synchronization race (diff)
downloadlinux-a2dccdb2055abeb8a7ce8e45e5f83de9c980a00c.tar.xz
linux-a2dccdb2055abeb8a7ce8e45e5f83de9c980a00c.zip
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] etr: fix clock synchronization race [S390] Fix IRQ tracing in case of PER
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions