Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable
Russell King [Mon, 8 Mar 2010 16:08:46 +0000 (16:08 +0000)]
1  2 
drivers/usb/gadget/s3c-hsotg.c

Simple merge