diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-27 12:40:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-27 12:40:40 -0400 |
| commit | 371858568e02698fe2de8ba4bf771e3f40db69e5 (patch) | |
| tree | 07ec799d7babae7eafda93d9dfd9d11fccff086f /drivers/net/via-velocity.h | |
| parent | e82b0f2cc21be905e504573483fa9542b15df96f (diff) | |
| parent | 54f4ee183aea859eb09f141dad3fc3c6f4fe0446 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[PATCH] powerpc: fix RTC/NVRAM accesses on Maple
[PATCH] ppc32 CPM_UART: various fixes for pq2 uart users
[PATCH] powerpc: linuxppc64.org no more
Diffstat (limited to 'drivers/net/via-velocity.h')
0 files changed, 0 insertions, 0 deletions