summaryrefslogtreecommitdiffstats
path: root/net/ipv4/protocol.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 17:50:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 17:50:34 -0800
commite37aa63e87bd581f9be5555ed0ba83f5295c92fc (patch)
tree83b57ba86bb9526f08ff4ed99e7e432dfceef4f6 /net/ipv4/protocol.c
parent9977d9b379cb77e0f67bd6f4563618106e58e11d (diff)
parent76583cffb77533fe564aaf21d184b89a5f419ffe (diff)
downloadop-kernel-dev-e37aa63e87bd581f9be5555ed0ba83f5295c92fc.zip
op-kernel-dev-e37aa63e87bd581f9be5555ed0ba83f5295c92fc.tar.gz
Merge tag 'for-linus-20121212' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300
Pull MN10300 changes from David Howells: "miscellaneous MN10300 arch patches. I've based it on top of Al Viro's signal tree - so these patches should be pulled after that." * tag 'for-linus-20121212' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300: MN10300: Use asm-generic/pci_iomap.h MN10300: Get rid of unused variable from ASB2305 PCI code MN10300: ASB2305 PCI code needs linux/irq.h mn10300/mm/fault.c: Port OOM changes to do_page_fault MN10300: Handle cacheable PCI regions in pci_iomap() MN10300: fix debug polling in ttySM driver MN10300: ttySM: clean up unnecessary casting MN10300: fix SMP synchronization between txdma and serial driver MN10300: fix serial port vdma irq setup for SMP MN10300: cleanup IRQ affinity setting MN10300: ttySM: Use memory barriers correctly in circular buffer logic
Diffstat (limited to 'net/ipv4/protocol.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud