diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 23:00:22 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 23:00:22 +0400 |
| commit | bf32d52c455d933cc9a459bb94af9ea8b5850af9 (patch) | |
| tree | 0d6af119b141e46e120ad06c867fe82ac3c00f1c /net/batman-adv/main.h | |
| parent | 0c375501be6e6dc23c11ebfa394434517444e62d (diff) | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
| download | linux-bf32d52c455d933cc9a459bb94af9ea8b5850af9.tar.xz | |
Merge 3.10-rc6 into tty-next
We want the changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/batman-adv/main.h')
0 files changed, 0 insertions, 0 deletions