aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds2011-08-23 18:09:08 -0700
committerLinus Torvalds2011-08-23 18:09:08 -0700
commit14c62e78dc1379185515be41903c4a667efc6d54 (patch)
tree87ab31efc0cb0d7009dc39abd9f569bcfb387260 /net
parentba8f318471f66d5d5b79da68112525cf432b2b18 (diff)
parent7ca0758cdb7c241cb4e0490a8d95f0eb5b861daf (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-32, vdso: On system call restart after SYSENTER, use int $0x80 x86, UV: Remove UV delay in starting slave cpus x86, olpc: Wait for last byte of EC command to be accepted
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions