Merge branch 'linus' into x86/urgent
[linux-2.6] / include / linux / memstick.h
2008-02-09  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-02-09  Alex Dubovmemstick: initial commit for Sony MemoryStick support