linux-pinenote/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
..
clock-sh7343.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7366.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7722.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7723.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7724.c Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
clock-sh7757.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7763.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7770.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
clock-sh7780.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7785.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7786.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-shx3.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
hwblk-sh7722.c sh: Add support for multiple hwblk counters 2009-07-20 04:23:39 +09:00
hwblk-sh7723.c sh: hwblk support for sh7723 2009-07-20 04:23:44 +09:00
hwblk-sh7724.c sh: hwblk support for sh7724 2009-08-04 14:40:55 +09:00
intc-shx3.c sh: Support userimask for all SH-X3 interrupt controllers. 2010-10-02 00:43:43 +09:00
Makefile sh: pinmux support for SH-X3 proto CPUs. 2010-10-02 19:20:51 +09:00
perf_event.c perf, arch: Cleanup perf-pmu init vs lockup-detector 2010-11-26 15:14:56 +01:00
pinmux-sh7722.c sh: add high impedance mode management for SIUA pins on sh7722 2010-02-02 13:02:30 +09:00
pinmux-sh7723.c sh: Move the CPU definition headers from asm/ to cpu/. 2008-10-20 12:04:53 +09:00
pinmux-sh7724.c sh: Add support for SH7724 (SH-Mobile R2R) CPU subtype. 2009-04-16 14:40:56 +09:00
pinmux-sh7757.c sh: modify pinmux for SH7757 2nd cut 2010-07-06 17:38:29 +09:00
pinmux-sh7785.c sh: sh7785 pinmux support 2008-10-23 11:59:37 +09:00
pinmux-sh7786.c sh: Tidy up sh7786 pinmux table. 2009-03-31 07:39:51 +09:00
pinmux-shx3.c sh: Drop __initdata for SH-X3 pinmux tables. 2010-10-04 05:00:19 +09:00
setup-sh7343.c sh: sh7343 clock string death. 2010-03-29 17:35:04 +09:00
setup-sh7366.c sh: sh7366 clock string death. 2010-03-29 17:36:41 +09:00
setup-sh7722.c sh: fix an SIU device name mismatch 2010-09-19 16:04:31 +01:00
setup-sh7723.c sh: sh7723 clkdev lookups. 2010-03-29 17:45:12 +09:00
setup-sh7724.c sh: Add sh7724 BEU resources 2010-08-04 15:58:18 +09:00
setup-sh7757.c sh: add some INTC_VECT for setup-sh7757 2010-07-06 17:38:27 +09:00
setup-sh7763.c sh: Kill off timer clock strings for legacy CPG parts. 2010-03-29 17:25:03 +09:00
setup-sh7770.c sh: Kill off timer clock strings for legacy CPG parts. 2010-03-29 17:25:03 +09:00
setup-sh7780.c sh: define DMA slaves per CPU type, remove now redundant header 2010-05-22 16:51:17 +09:00
setup-sh7785.c sh: define DMA slaves per CPU type, remove now redundant header 2010-05-22 16:51:17 +09:00
setup-sh7786.c sh: Add EHCI support for SH7786. 2010-11-01 17:05:30 -04:00
setup-shx3.c sh: Support early IRQ vector map reservation for delayed controllers. 2010-10-02 22:02:07 +09:00
smp-shx3.c sh: CPU hotplug support for SH-X3 SMP. 2010-04-26 19:09:57 +09:00
ubc.c sh: Abstracted SH-4A UBC support on hw-breakpoint core. 2010-01-05 19:06:45 +09:00