diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-28 18:47:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-28 18:47:06 +1100 |
| commit | f34ecab011d0f6193101fb811152bf72cd0fa605 (patch) | |
| tree | f24d13ceb2c5dbd8e81631271a6c79a92c322159 /fs/notify/mark.c | |
| parent | 60bbd61ae182832227f57dfc7374e65d97d824f6 (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/notify/mark.c')
0 files changed, 0 insertions, 0 deletions