diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-26 02:28:05 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-26 02:28:05 +0100 |
| commit | 48e316bc2e045206248c6c75c0d5bbc0c9ddc32c (patch) | |
| tree | be43e95ea36e4f7f427d79cf2870e8d4774cb95f /net/xfrm/xfrm_user.c | |
| parent | xfrm: remove unneeded method typedef declaration in net/xfrm.h. (diff) | |
| parent | e1000e: rename e1000e_reload_nvm() and call as function pointer (diff) | |
| download | linux-48e316bc2e045206248c6c75c0d5bbc0c9ddc32c.tar.xz linux-48e316bc2e045206248c6c75c0d5bbc0c9ddc32c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'net/xfrm/xfrm_user.c')
0 files changed, 0 insertions, 0 deletions