summaryrefslogtreecommitdiffstats
path: root/fs/fcntl.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-04 08:32:12 +0200
committerDavid S. Miller <davem@davemloft.net>2014-06-04 08:32:12 +0200
commitc99f7abf0e69987e4add567e155e042cb1f2a20b (patch)
treed23898dc30ed25c1dae9bb6325041027d412397a /fs/fcntl.c
parentnet: remove some unless free on failure in alloc_netdev_mqs() (diff)
parentsh_eth: fix SH7619/771x support (diff)
downloadlinux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.xz
linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: include/net/inetpeer.h net/ipv6/output_core.c Changes in net were fixing bugs in code removed in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/fcntl.c')
0 files changed, 0 insertions, 0 deletions