diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-03-13 08:14:43 (GMT) |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-03-13 08:14:43 (GMT) |
| commit | fe986f9d88ab8079c91669b7f175081f15491a80 (patch) | |
| tree | 73be54e2c5378750dee0ebc0720af5143d2c4dc6 /drivers/hwmon/adt7310.c | |
| parent | 5f44e4c185ec5a4a438841cbd4983d0c4a106a4a (diff) | |
| parent | ab29743117f9f4c22ac44c13c1647fb24fb2bafe (diff) | |
| download | linux-fe986f9d88ab8079c91669b7f175081f15491a80.tar.xz | |
Merge branch 'xfs-O_TMPFILE-support' into for-next
Conflicts:
fs/xfs/xfs_trans_resv.c
- fix for XFS_INODE_CLUSTER_SIZE macro removal
Diffstat (limited to 'drivers/hwmon/adt7310.c')
0 files changed, 0 insertions, 0 deletions