1459143386
Conflicts: drivers/net/ieee802154/fakehard.c A bug fix went into 'net' for ieee802154/fakehard.c, which is removed in 'net-next'. Add build fix into the merge from Stephen Rothwell in openvswitch, the logging macros take a new initial 'log' argument, a new call was added in 'net' so when we merge that in here we have to explicitly add the new 'log' arg to it else the build fails. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| bitsperlong.h | ||
| byteorder.h | ||
| errno.h | ||
| fcntl.h | ||
| ioctl.h | ||
| ioctls.h | ||
| ipcbuf.h | ||
| Kbuild | ||
| mman.h | ||
| msgbuf.h | ||
| pdc.h | ||
| posix_types.h | ||
| ptrace.h | ||
| sembuf.h | ||
| setup.h | ||
| shmbuf.h | ||
| sigcontext.h | ||
| siginfo.h | ||
| signal.h | ||
| socket.h | ||
| sockios.h | ||
| stat.h | ||
| statfs.h | ||
| swab.h | ||
| termbits.h | ||
| termios.h | ||
| types.h | ||
| unistd.h | ||