1. 03 Sep, 2008 1 commit
    • Tony Lindgren's avatar
      Merge current mainline tree into linux-omap tree · 95f289ae
      Tony Lindgren authored
      Merge branches 'master' and 'linus'
      
      Conflicts:
      
      	drivers/usb/gadget/omap_udc.c
      	drivers/usb/musb/Kconfig
      	drivers/usb/musb/Makefile
      	drivers/usb/musb/cppi_dma.c
      	drivers/usb/musb/davinci.c
      	drivers/usb/musb/musb_core.c
      	drivers/usb/musb/musb_core.h
      	drivers/usb/musb/musb_debug.h
      	drivers/usb/musb/musb_gadget.c
      	drivers/usb/musb/musb_gadget_ep0.c
      	drivers/usb/musb/musb_host.c
      	drivers/usb/musb/musbhsdma.c
      	drivers/usb/musb/omap2430.c
      	drivers/usb/musb/omap2430.h
      	drivers/usb/musb/tusb6010.c
      	drivers/usb/musb/tusb6010_omap.c
      95f289ae
  2. 28 Aug, 2008 17 commits
  3. 27 Aug, 2008 22 commits