diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 19:23:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 19:23:49 +0200 |
| commit | b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca (patch) | |
| tree | c7b04bfc8ece8b0121a9030c7f49e7bf9bf570d1 /drivers/net/gianfar.c | |
| parent | Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | x86: split __phys_addr out into separate file (diff) | |
| download | linux-b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca.tar.xz linux-b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca.zip | |
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/gianfar.c')
0 files changed, 0 insertions, 0 deletions