diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-30 10:44:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-30 10:44:13 -0700 |
commit | 5fc3054d76a05633ae7341163b8c22a51e63483e (patch) | |
tree | fa8bbe4c3bbf1cd10f8ec249d9cb6b50c31b8404 /net/batman-adv/types.h | |
parent | 3b775e2246ae861daec276d3229a7de2af69b7db (diff) | |
parent | e336f61fe238ade68eca7850d64fd6c194bdc998 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
MAINTAINERS: update AVR32 and AT32AP maintainers
Diffstat (limited to 'net/batman-adv/types.h')
0 files changed, 0 insertions, 0 deletions