diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 15:29:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 15:29:00 +1100 |
| commit | bb21b6be719450d43ef87813c2fbe02c0b9c8a23 (patch) | |
| tree | 85df826a6f006621a9f21d3132e877a749aa1199 /include/linux/suspend.h | |
| parent | d06be737d1d7d996cb2c014c198f8a2bdb6478de (diff) | |
| parent | 25051158bbed127e8672b43396c71c5eb610e5f1 (diff) | |
Merge commit 'xfs/master'
Conflicts:
fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h
Diffstat (limited to 'include/linux/suspend.h')
0 files changed, 0 insertions, 0 deletions