summaryrefslogtreecommitdiff
path: root/fs/nfs/nfsroot.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-30 02:23:28 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-30 02:23:28 +0400
commita2dccdb2055abeb8a7ce8e45e5f83de9c980a00c (patch)
tree14b0997d648a158e05fa2243b1beddaa6d4cfd36 /fs/nfs/nfsroot.c
parent7d5fcdc38ff0425ff52bffe26d481ea07547574c (diff)
parent33fea794b9deeb8ffb77e284eb37375b8f45a2c4 (diff)
downloadlinux-a2dccdb2055abeb8a7ce8e45e5f83de9c980a00c.tar.xz
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 'fs/nfs/nfsroot.c')
0 files changed, 0 insertions, 0 deletions