diff options
| author | Linus Torvalds <[email protected]> | 2013-10-18 19:25:11 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-10-18 19:25:11 +0000 |
| commit | 9219cec5f235240654a4887caff4589d1c536212 (patch) | |
| tree | 92fad114ca3a4158dba563935cedf5ae20ea8966 /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | x86: Update UV3 hub revision ID (diff) | |
| download | kernel-9219cec5f235240654a4887caff4589d1c536212.tar.gz kernel-9219cec5f235240654a4887caff4589d1c536212.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Two fixlets:
- fix a (rare-config) build bug
- fix a next-gen SGI/UV hw/firmware enumeration bug"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Update UV3 hub revision ID
x86/microcode: Correct Kconfig dependencies
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions