diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-01 20:25:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-01 20:25:47 +1100 |
| commit | 44adf709077833552d1d8b5b48ecedd29dcd3a29 (patch) | |
| tree | 2acb4e55a6cbd0e0fd62e07610b7c1e3d51d92d7 /fs/libfs.c | |
| parent | 1e82bdb839a4b14466ebcfe726f5fae5685feb8a (diff) | |
| parent | 8895b8fe57765ad835cb589f76d097fc1848c398 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
Documentation/devicetree/bindings/i2c/trivial-devices.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/rtc/rtc-omap.c
drivers/usb/storage/debug.c
fs/ocfs2/inode.h
kernel/exit.c
kernel/printk/printk.c
mm/hugetlb.c
Diffstat (limited to 'fs/libfs.c')
0 files changed, 0 insertions, 0 deletions