aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m32r/socket.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-01 14:31:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-01 14:31:31 -0400
commit61434392f797cf89872bda87dff8b3395edf4108 (patch)
tree489e344b0a5142dd4dc74ba3f4972592b90bacec /include/asm-m32r/socket.h
parent0e45adb8f5371f3d20a6df21cd13ce32fbe9bf15 (diff)
parentf9e8b782608021c0cbd936923cc0e509521b594d (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus: [MIPS] XSS1500: Fix compilation [MIPS] Bigsur: make defconfig more useful. [MIPS] Alchemy: work around clock misdetection on early Au1000 [MIPS] Add missing 4KEC TLB refill handler [MIPS] BCM1480: Fix PCI/HT IO access [MIPS] Fix the installation condition of MIPS clocksource [MIPS] Check for GCC r10k-cache-barrier support [MIPS] I8253: Export i2853_lock to modules. [MIPS] VPE loader: Check result of memory allocation.
Diffstat (limited to 'include/asm-m32r/socket.h')
0 files changed, 0 insertions, 0 deletions