summaryrefslogtreecommitdiff
path: root/drivers/net/mipsnet.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 21:23:49 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 21:23:49 +0400
commitb8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca (patch)
treec7b04bfc8ece8b0121a9030c7f49e7bf9bf570d1 /drivers/net/mipsnet.c
parent0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a (diff)
parent78c86e5e5691fc84d5fbea0cd4ac7147e87b7490 (diff)
downloadlinux-b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca.tar.xz
Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: split __phys_addr out into separate file xen: use stronger barrier after unlocking lock xen: only enable interrupts while actually blocking for spinlock xen: make -fstack-protector work under Xen
Diffstat (limited to 'drivers/net/mipsnet.c')
0 files changed, 0 insertions, 0 deletions