Merge branch 'master' into upstream-fixes
[sfrench/cifs-2.6.git] / drivers / net / irda / au1000_ircc.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2