Merge commit 'origin' into devel
[pandora-kernel.git] / drivers / usb / image / Makefile
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2