diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-29 15:23:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-29 15:23:28 -0700 |
| commit | a2dccdb2055abeb8a7ce8e45e5f83de9c980a00c (patch) | |
| tree | 14b0997d648a158e05fa2243b1beddaa6d4cfd36 /fs/nfs/nfsroot.c | |
| parent | 7d5fcdc38ff0425ff52bffe26d481ea07547574c (diff) | |
| parent | 33fea794b9deeb8ffb77e284eb37375b8f45a2c4 (diff) | |
| download | linux-a2dccdb2055abeb8a7ce8e45e5f83de9c980a00c.tar.bz2 | |
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