Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6] / arch / sparc / kernel / psycho_common.h
2008-12-04 Sam Ravnborgsparc,sparc64: unify kernel/