Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / linux / if_x25.h
2010-04-22 Andrew HendryX25: Add if_x25.h and x25 to device identifiers