Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / linux / lp.h
2008-02-06 Matthias KaehlckeParallel port: convert port_mutex to the mutex API
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2