diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 11:00:31 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 11:00:31 -0800 |
commit | e17587b5b90da78f56c7a948e54dbac3dc791f31 (patch) | |
tree | 60228100507c7c6509188d9f3ee7bd43947c718d /include/linux/if_tun.h | |
parent | 29ac0052ea454871273a1fc7ef09a97f3c214ee6 (diff) | |
parent | 5998a3cf327c90d0a7116eca72c0d2df2be8ecfd (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
[AVR32] Fix wrong pt_regs in critical exception handler
[AVR32] Fix copy_to_user_page() breakage
[AVR32] Follow the rules when dealing with the OCD system
[AVR32] Clean up OCD register usage
[AVR32] Implement irqflags trace and lockdep support
[AVR32] Implement stacktrace support
[AVR32] Kconfig: Use def_bool instead of bool + default
[AVR32] Fix invalid status register bit definitions in asm/ptrace.h
[AVR32] Add TIF_RESTORE_SIGMASK to the work masks
Diffstat (limited to 'include/linux/if_tun.h')
0 files changed, 0 insertions, 0 deletions