diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-07 16:51:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-07 16:51:15 +1000 |
| commit | e2ea6c3da34fa52f332cbc7914ca282cf4d2eeb9 (patch) | |
| tree | 3654a6f6518fd66f0007528705ff72c553492bab /include/uapi/linux/fcntl.h | |
| parent | 3cd70aa838d4412ca4a4a69564b590d7217fefb5 (diff) | |
| parent | 929c76e4e6292770322822a50e08b8feaa4afbbf (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/arm64/Kconfig
drivers/rapidio/devices/tsi721_dma.c
kernel/kexec.c
net/batman-adv/fragmentation.c
Diffstat (limited to 'include/uapi/linux/fcntl.h')
0 files changed, 0 insertions, 0 deletions