diff options
| author |   Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 17:34:26 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 17:34:26 +1100 |
| commit | 27a0464a6cb837d3a90b6e69365dfc01cb0dff2f (patch) | |
| tree | 361f00f4d4ad4c01b6144c52004bee2b948742ad /net/unix/af_unix.c | |
| parent | Merge branch 'master' of git+ssh://git.melbourne.sgi.com/git/xfs (diff) | |
| parent | Null pointer deref with hrtimer_try_to_cancel() (diff) | |
| download | wireguard-linux-27a0464a6cb837d3a90b6e69365dfc01cb0dff2f.tar.xz wireguard-linux-27a0464a6cb837d3a90b6e69365dfc01cb0dff2f.zip | |
[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/xfs_rename.c
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions