Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[safe/jmp/linux-2.6] / include / linux / rio_ids.h
2005-11-07 Matt Porter[PATCH] RapidIO support: core includes