diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 17:39:03 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 17:39:03 +0200 |
commit | daf342af2f7856fd2f5c66b9fb39a8f24986ca53 (patch) | |
tree | 9cb74ca3ea975e36afb7dbfe6c76b6805485e8b3 /arch/x86/power | |
parent | Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | fs/jfs/super.c: convert simple_str to kstr (diff) | |
download | linux-daf342af2f7856fd2f5c66b9fb39a8f24986ca53.tar.xz linux-daf342af2f7856fd2f5c66b9fb39a8f24986ca53.zip |
Merge tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy into next
Pull jfs changes from Dave Kleikamp.
* tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy:
fs/jfs/super.c: convert simple_str to kstr
fs/jfs/jfs_dmap.c: replace min/casting by min_t
fs/jfs/super.c: remove 0 assignment to static + code clean-up
fs/jfs/jfs_logmgr.c: remove NULL assignment on static
JFS: Check for NULL before calling posix_acl_equiv_mode()
fs/jfs/jfs_inode.c: atomically set inode->i_flags
Diffstat (limited to 'arch/x86/power')
0 files changed, 0 insertions, 0 deletions