renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
Code
10cbb0ba42
linux-next/arch/arm/mach-mx3
History
Linus Torvalds 5cc1035062 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (141 commits)
  USB: mct_u232: fix broken close
  USB: gadget: amd5536udc.c: fix error path
  USB: imx21-hcd - fix off by one resource size calculation
  usb: gadget: fix Kconfig warning
  usb: r8a66597-udc: Add processing when USB was removed.
  mxc_udc: add workaround for ENGcm09152 for i.MX35
  USB: ftdi_sio: add device ids for ScienceScope
  USB: musb: AM35x: Workaround for fifo read issue
  USB: musb: add musb support for AM35x
  USB: AM35x: Add musb support
  usb: Fix linker errors with CONFIG_PM=n
  USB: ohci-sh - use resource_size instead of defining its own resource_len macro
  USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
  USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
  USB: xhci: Fix compile error when CONFIG_PM=n
  USB: accept some invalid ep0-maxpacket values
  USB: xHCI: PCI power management implementation
  USB: xHCI: bus power management implementation
  USB: xHCI: port remote wakeup implementation
  USB: xHCI: port power management implementation
  ...

Manually fix up (non-data) conflict: the SCSI merge gad renamed the
'hw_sector_size' member to 'physical_block_size', and the USB tree
brought a new use of it.
2010-10-22 20:30:48 -07:00
..
clock-imx31.c ARM: imx: fix/define clocks and create devices for imx dma 2010-10-11 15:30:31 +02:00
clock-imx35.c ARM: imx: fix/define clocks and create devices for imx dma 2010-10-11 15:30:31 +02:00
cpu.c ARM: mx35: Add mx35_revision function to query the silicon revision 2010-10-11 15:28:32 +02:00
crm_regs.h imx31: define and use MX31_IO_ADDRESS 2010-01-08 16:41:26 +01:00
devices-imx31.h ARM: imx: reorganize nand registration to use a struct 2010-10-01 09:33:02 +02:00
devices-imx35.h imx-esdhc: update devices registration 2010-10-19 18:45:00 +02:00
devices.c ARM: imx: dynamically register fec devices 2010-10-11 15:31:37 +02:00
devices.h ARM: imx: dynamically register fec devices 2010-10-11 15:31:37 +02:00
eukrea_mbimxsd-baseboard.c eukrea_mbimxsd-baseboard: Pass the correct GPIO to gpio_free 2010-10-19 18:45:21 +02:00
iomux-imx31.c imx31: define and use MX31_IO_ADDRESS 2010-01-08 16:41:26 +01:00
Kconfig eukrea_mbimxsd for cpuimx35: add CAN & SDCard support 2010-10-11 15:22:12 +02:00
mach-armadillo5x0.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-cpuimx35.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
mach-kzm_arm11_01.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-mx31_3ds.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-mx31ads.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-mx31lilly.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-mx31lite.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-mx31moboard.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-mx35_3ds.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-pcm037_eet.c mach-pcm037_eet: fix compile errors 2010-10-19 18:45:01 +02:00
mach-pcm037.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-pcm043.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-qong.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
Makefile ARM: mx3: use MX3x_ prefixed version of CHIP_REV_x 2010-10-11 15:28:32 +02:00
Makefile.boot [ARM] 4461/1: MXC platform and i.MX31ADS core support 2007-07-22 15:44:46 +01:00
mm.c MX35: Fix bogus L2 cache settings 2010-10-11 15:31:39 +02:00
mx31lilly-db.c ARM: imx: dynamically register imx-uart devices (imx31) 2010-06-30 09:00:58 +02:00
mx31lite-db.c ARM: imx: dynamically register imx-uart devices (imx31) 2010-06-30 09:00:58 +02:00
mx31moboard-devboard.c ARM: imx: dynamically register imx-uart devices (imx31) 2010-06-30 09:00:58 +02:00
mx31moboard-marxbot.c ARM: mx3: remove paragraphs with old address of the FSF 2010-06-30 09:00:26 +02:00
mx31moboard-smartbot.c USB: otg/ulpi: extend the generic ulpi driver. 2010-08-10 14:35:40 -07:00
pcm037.h ARM: add support for the EET board, based on the i.MX31 pcm037 module 2009-06-23 14:25:26 +02:00