summaryrefslogtreecommitdiffstats
path: root/include/linux/sonet.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-31 16:13:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-31 16:13:44 -0700
commitb1c907f3b2675ecb01e340948fc62d6535ff5ac3 (patch)
tree978e7ba356ff57c4febe55f3ee0d0955ea721f14 /include/linux/sonet.h
parent91e67a996c60a347ad7b918a74efb0f6b3b274c3 (diff)
parent84ac218f0257a0cfd7689d9a44f53118dbf307b3 (diff)
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW usage microblaze: Use delay slot in __strnlen_user, __strncpy_user microblaze: Remove NET_IP_ALIGN from system.h microblaze: Add __ucmpdi2() helper function microblaze: Raise SIGFPE/FPE_INTDIV for div by zero microblaze: Switch ELF_ARCH code to 189 microblaze: Added DMA sync operations microblaze: Moved __dma_sync() to dma-mapping.h microblaze: Add PVR for Microblaze v8.20.a microblaze: Fix access_ok macro microblaze: Add loop unrolling for PAGE in copy_tofrom_user microblaze: Simplify logic for unaligned byte copying microblaze: Change label names - copy_tofrom_user microblaze: Separate fixup section definition microblaze: Change label name in copy_tofrom_user microblaze: Clear top bit from cnt32_to_63
Diffstat (limited to 'include/linux/sonet.h')
0 files changed, 0 insertions, 0 deletions