Merge branch 'tracing/ftrace' into tracing/urgent
[linux-2.6] / arch / parisc / include / asm / sockios.h
2008-10-22  Ingo MolnarMerge branch 'tracing/ftrace' into tracing/urgent
2008-10-20  Linus TorvaldsMerge git://git./linux/kernel/git/kyle/parisc-2.6
2008-10-10  Kyle McMartinparisc: move include/asm-parisc to arch/parisc/include/asm