Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 20 Apr 2008 00:38:41 +0000 (20:38 -0400)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 20 Apr 2008 00:38:41 +0000 (20:38 -0400)
1  2 
drivers/usb/gadget/atmel_usba_udc.c

Simple merge