diff options
| author | David S. Miller <davem@davemloft.net> | 2013-11-05 01:59:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-05 01:59:44 +0100 |
| commit | 13521a57974635384db51d65135cc0267c6ae771 (patch) | |
| tree | 7efbad661e4cdbb5e469dcb7c64e5b35ddc0266a /fs/notify/fanotify/fanotify_user.c | |
| parent | tcp: properly handle stretch acks in slow start (diff) | |
| parent | can: ti_hecc: remove priv->can.do_get_state() callback (diff) | |
| download | linux-13521a57974635384db51d65135cc0267c6ae771.tar.xz linux-13521a57974635384db51d65135cc0267c6ae771.zip | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
here's a pull request for net-next.
It includes a patch by Oliver Hartkopp et al. that adds documentation
for the broadcast manager to Documentation/networking/can.txt. Three
patches by me that clean up the netlink handling code in the CAN core.
And another patch that removes a not needed function from the ti_hecc
driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/notify/fanotify/fanotify_user.c')
0 files changed, 0 insertions, 0 deletions