android_kernel_samsung_msm8976/arch/powerpc/sysdev
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
..
bestcomm
qe_lib
6xx-suspend.S
axonram.c
cpm1.c
cpm2.c
cpm2_pic.c
cpm2_pic.h
cpm_common.c
dart.h
dart_iommu.c
dcr-low.S
dcr.c
fsl_85xx_cache_ctlr.h powerpc/85xx: add cache-sram support 2010-10-14 00:54:38 -05:00
fsl_85xx_cache_sram.c powerpc/85xx: add cache-sram support 2010-10-14 00:54:38 -05:00
fsl_85xx_l2ctlr.c powerpc/85xx: add cache-sram support 2010-10-14 00:54:38 -05:00
fsl_gtm.c
fsl_lbc.c
fsl_msi.c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2010-10-21 21:19:54 -07:00
fsl_msi.h
fsl_pci.c powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips 2010-10-14 00:53:03 -05:00
fsl_pci.h powerpc/fsl-pci: Fix MSI support on 83xx platforms 2010-10-14 00:52:30 -05:00
fsl_pmc.c
fsl_rio.c fsl_rio: Add comments for sRIO registers. 2010-10-14 01:02:38 -05:00
fsl_soc.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
fsl_soc.h
grackle.c
i8259.c
indirect_pci.c
ipic.c
ipic.h
Kconfig
Makefile powerpc/85xx: add cache-sram support 2010-10-14 00:54:38 -05:00
micropatch.c
mmio_nvram.c
mpc5xxx_clocks.c
mpc8xx_pic.c
mpc8xx_pic.h
mpc8xxx_gpio.c powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers 2010-10-14 00:53:00 -05:00
mpic.c
mpic.h
mpic_msi.c
mpic_pasemi_msi.c
mpic_u3msi.c
msi_bitmap.c
mv64x60.h
mv64x60_dev.c
mv64x60_pci.c
mv64x60_pic.c
mv64x60_udbg.c
of_rtc.c
pmi.c
ppc4xx_gpio.c
ppc4xx_pci.c
ppc4xx_pci.h
ppc4xx_soc.c
rtc_cmos_setup.c
simple_gpio.c
simple_gpio.h
tsi108_dev.c
tsi108_pci.c
uic.c
xilinx_intc.c
xilinx_pci.c