| commit | 1459143386c5d868c87903b8d433a52cffcf3e66 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Nov 21 22:28:24 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Nov 21 22:28:24 2014 -0500 |
| tree | e7878a550aaf6a3af5e84f4258bbcc3bbdd20fef | |
| parent | 53b15ef3c2a6bac8e3d9bb58c5689d731ed9593b [diff] | |
| parent | 8a84e01e147f44111988f9d8ccd2eaa30215a0f2 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 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>