diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-19 16:17:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-19 16:17:27 +1100 |
| commit | 54e506404ce8858ae08df253e98f6de46c9c03b5 (patch) | |
| tree | 37e1feac3410313e9f65dc52040b92e3cdf19ab5 /net/batman-adv/originator.c | |
| parent | 0f1320ed6ffc3c20b12db498e778a395556edbdb (diff) | |
| parent | 4d918924509b26ac1eee5826fef597b9c5da4f62 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
drivers/tty/vt/vt.c
Diffstat (limited to 'net/batman-adv/originator.c')
0 files changed, 0 insertions, 0 deletions