diff options
author | 2008-11-30 13:01:04 -0800 | |
---|---|---|
committer | 2008-11-30 13:01:04 -0800 | |
commit | 66a45cc4cc1c1f7d1ccae4d0fee261eab5560682 (patch) | |
tree | 208dc2307a2fb9c753026bf17509a0738ada1173 /net/unix/af_unix.c | |
parent | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
parent | x86: always define DECLARE_PCI_UNMAP* macros (diff) | |
download | linux-dev-66a45cc4cc1c1f7d1ccae4d0fee261eab5560682.tar.xz linux-dev-66a45cc4cc1c1f7d1ccae4d0fee261eab5560682.zip |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: always define DECLARE_PCI_UNMAP* macros
x86: fixup config space size of CPU functions for AMD family 11h
x86, bts: fix wrmsr and spinlock over kmalloc
x86, pebs: fix PEBS record size configuration
x86, bts: turn macro into static inline function
x86, bts: exclude ds.c from build when disabled
arch/x86/kernel/pci-calgary_64.c: change simple_strtol to simple_strtoul
x86: use limited register constraint for setnz
xen: pin correct PGD on suspend
x86: revert irq number limitation
x86: fixing __cpuinit/__init tangle, xsave_cntxt_init()
x86: fix __cpuinit/__init tangle in init_thread_xstate()
oprofile: fix an overflow in ppro code
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions