kernel-fxtec-pro1x/arch/arm
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
..
boot Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel 2011-01-05 18:08:10 +00:00
common Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
configs Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
include/asm Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
kernel Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-06 16:50:35 -08:00
lib Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-aaec2000
mach-at91 Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
mach-bcmring Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-clps711x
mach-cns3xxx Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-davinci Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
mach-dove
mach-ebsa110
mach-ep93xx Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-footbridge
mach-gemini
mach-h720x
mach-imx Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-integrator Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-iop13xx Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-iop32x
mach-iop33x
mach-ixp4xx Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-ks8695 ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() 2011-01-03 11:27:43 +00:00
mach-l7200/include/mach
mach-lh7a40x
mach-loki
mach-lpc32xx Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-mmp Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-msm Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-06 16:50:35 -08:00
mach-mv78xx0
mach-mx3 Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-mx5 Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-mxc91231 Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-mxs ARM: mxs: Add build configuration for mxs 2010-12-20 17:30:44 +01:00
mach-netx ARM: netx: update clock source registration 2010-12-22 22:44:33 +00:00
mach-nomadik
mach-ns9xxx ARM: ns9xxx: update clock source registration 2010-12-22 22:44:34 +00:00
mach-nuc93x
mach-omap1 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
mach-omap2 Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
mach-orion5x Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-pnx4008 Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-pxa Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-realview Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-rpc
mach-s3c24a0/include/mach
mach-s3c64xx
mach-s3c2400
mach-s3c2410
mach-s3c2412 Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-s3c2416 ARM S3C24XX: Fix compilation of PM code for S3C2416 2010-12-17 14:45:01 +09:00
mach-s3c2440
mach-s3c2443
mach-s5p64x0
mach-s5p6442
mach-s5pc100
mach-s5pv210 ARM: S5PV210: update MAX8998 platform data to get rid of WARN() 2010-12-17 14:47:42 +09:00
mach-s5pv310 Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-sa1100 Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
mach-shark
mach-shmobile Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-06 16:50:35 -08:00
mach-spear3xx
mach-spear6xx
mach-stmp37xx
mach-stmp378x
mach-tcc8k Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-tegra Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-u300 Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-ux500 Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-versatile Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-vexpress Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-w90x900 Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mm Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
nwfpe
oprofile
plat-iop Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
plat-mxc Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
plat-nomadik Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
plat-omap Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
plat-orion ARM: orion: convert sched_clock() to use new infrastructure 2010-12-22 22:44:49 +00:00
plat-pxa ARM: pxa: support pxa95x 2010-12-18 21:02:14 +08:00
plat-s3c24xx ARM: S3C24XX: Fix CONFIG_S3C_DEV_NAND Kconfig entry 2010-12-17 14:44:54 +09:00
plat-s5p
plat-samsung
plat-spear Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
plat-stmp3xxx Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
plat-tcc
plat-versatile Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
tools
vfp Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
Kconfig Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
Kconfig-nommu
Kconfig.debug Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
Makefile Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new 2011-01-03 10:15:11 +01:00