original_kernel/arch/sh/kernel/cpu/sh4a
Linus Torvalds 3e5b08cbbf Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
  USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
  USB: serial: ftdi_sio: add support for TIOCSERGETLSR
  USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
  USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
  usb: ehci-omap: fix tll channel enable mask
  usb: ohci-omap3: fix trivial typo
  USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
  USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
  USB: gadget: update ci13xxx to work with g_ether
  USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
  Revert "USB: musb: pm: don't rely fully on clock support"
  Revert "USB: musb: blackfin: pm: make it work"
  USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
  USB: uas: Ensure we only bind to a UAS interface
  USB: uas: Rename sense pipe and sense urb to status pipe and status urb
  USB: uas: Use kzalloc instead of kmalloc
  USB: uas: Fix up the Sense IU
  usb: musb: core: kill unneeded #include's
  DA8xx: assign name to MUSB IRQ resource
  usb: gadget: g_ncm added
  ...

Manually fix up trivial conflicts in USB Kconfig changes in:
	arch/arm/mach-omap2/Kconfig
	arch/sh/Kconfig
	drivers/usb/Kconfig
	drivers/usb/host/ehci-hcd.c
and annoying chip clock data conflicts in:
	arch/arm/mach-omap2/clock3xxx_data.c
	arch/arm/mach-omap2/clock44xx_data.c
2011-01-07 13:16:28 -08:00
..
Makefile
clock-sh7343.c
clock-sh7366.c
clock-sh7722.c
clock-sh7723.c
clock-sh7724.c Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
clock-sh7757.c
clock-sh7763.c
clock-sh7770.c
clock-sh7780.c
clock-sh7785.c
clock-sh7786.c
clock-shx3.c
hwblk-sh7722.c
hwblk-sh7723.c
hwblk-sh7724.c
intc-shx3.c
perf_event.c perf, arch: Cleanup perf-pmu init vs lockup-detector 2010-11-26 15:14:56 +01:00
pinmux-sh7722.c
pinmux-sh7723.c
pinmux-sh7724.c
pinmux-sh7757.c
pinmux-sh7785.c
pinmux-sh7786.c
pinmux-shx3.c
setup-sh7343.c
setup-sh7366.c
setup-sh7722.c
setup-sh7723.c
setup-sh7724.c
setup-sh7757.c
setup-sh7763.c
setup-sh7770.c
setup-sh7780.c
setup-sh7785.c
setup-sh7786.c
setup-shx3.c
smp-shx3.c
ubc.c