1
0
Fork 0
alistair23-linux/Documentation/powerpc
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
..
dts-bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
00-INDEX powerpc: Remove outdated Documentation/powerpc/smp.txt 2008-10-07 14:26:19 +11:00
booting-without-of.txt booting-without-of: Remove nonexistent chapters from TOC, fix numbering 2010-08-16 14:55:42 -06:00
bootwrapper.txt powerpc/bootwrapper: Add documentation of boot wrapper targets 2008-07-04 00:59:03 -06:00
cpu_features.txt documentation: update header file paths 2009-01-06 15:59:28 -08:00
eeh-pci-error-recovery.txt powerpc: Move include files to arch/powerpc/include/asm 2008-08-04 12:02:00 +10:00
hvcs.txt Documentation: fix ozlabs.org mailing list address 2010-08-20 09:55:41 -07:00
kvm_440.txt KVM: ppc: PowerPC 440 KVM implementation 2008-04-27 18:21:39 +03:00
mpc52xx.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
phyp-assisted-dump.txt Documentation/: it's -> its where appropriate 2010-04-23 02:09:52 +02:00
ptrace.txt powerpc: Extended ptrace interface 2010-02-17 14:03:17 +11:00
qe_firmware.txt trivial: Miscellaneous documentation typo fixes 2009-06-12 18:01:47 +02:00
sound.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
zImage_layout.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00