summaryrefslogtreecommitdiffstats
path: root/drivers/net/ixp2000/ixp2400_rx.ucode
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-24 03:09:08 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-24 03:09:08 +0200
commit14c62e78dc1379185515be41903c4a667efc6d54 (patch)
tree87ab31efc0cb0d7009dc39abd9f569bcfb387260 /drivers/net/ixp2000/ixp2400_rx.ucode
parentm68k: fix __page_to_pfn for a const struct page argument (diff)
parentx86-32, vdso: On system call restart after SYSENTER, use int $0x80 (diff)
downloadlinux-14c62e78dc1379185515be41903c4a667efc6d54.tar.xz
linux-14c62e78dc1379185515be41903c4a667efc6d54.zip
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 'drivers/net/ixp2000/ixp2400_rx.ucode')
0 files changed, 0 insertions, 0 deletions