Merge branch 'master' of /repos/git/net-2.6
[safe/jmp/linux-2.6] / include / linux / cm4000_cs.h
2005-11-14 Harald Welte[PATCH] New Omnikey Cardman 4000 driver