Linus Torvalds 7a9b149212 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: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	drivers/input/tablet/acecad.c
	drivers/input/tablet/kbtab.c
	drivers/input/tablet/wacom_sys.c
	drivers/media/video/gspca/gspca.c
	sound/usb/usbaudio.c

2010-05-20 21:26:12 -07:00

..

include/mach

omap2: Fix ARM processor check for 24xx

2010-04-23 15:35:11 -07:00

board-2430sdp.c

omap: musb: Pass board specific data from board file

2010-02-19 15:22:17 -08:00

board-3430sdp.c

omap2/3/4: ehci: avoid compiler error with touchbook

2010-03-11 09:32:03 -08:00

board-3630sdp.c

omap3: 3630sdp: Explicitly enable all UARTs

2010-03-15 16:34:19 -05:00

board-4430sdp.c

omap4: Fix build break by moving omap_smc1 into a separate .S

2010-03-11 09:38:53 -08:00

board-am3517evm.c

AM3517: initialize i2c subsystem after mux subsystem

2010-04-23 15:35:11 -07:00

board-apollon.c

…

board-cm-t35.c

omap2/3/4: ehci: avoid compiler error with touchbook

2010-03-11 09:32:03 -08:00

board-devkit8000.c

omap: Devkit8000: Remove unused pins

2010-04-23 15:37:24 -07:00

board-generic.c

…

board-h4.c

…

board-igep0020.c

omap3: Fix EHCI port for IGEP v2 board

2010-04-23 15:35:11 -07:00

board-ldp.c

omap: musb: Pass board specific data from board file

2010-02-19 15:22:17 -08:00

board-n8x0.c

omap: Fix n8x0 mmc_mmc_init compile warnings and typos

2010-04-23 15:35:11 -07:00

board-omap3beagle.c

omap2/3/4: ehci: avoid compiler error with touchbook

2010-03-11 09:32:03 -08:00

board-omap3evm.c

usb: musb: Add extvbus in musb_board_data

2010-05-20 13:21:36 -07:00

board-omap3pandora.c

omap3: pandora: add missing i2c3 board_info

2010-03-11 15:55:43 -08:00

board-omap3touchbook.c

omap2/3/4: ehci: avoid compiler error with touchbook

2010-03-11 09:32:03 -08:00

board-overo.c

omap2/3/4: ehci: avoid compiler error with touchbook

2010-03-11 09:32:03 -08:00

board-rx51-peripherals.c

…

board-rx51-sdram.c

…

board-rx51.c

Merge branch 'pm-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

2010-02-23 19:22:48 -08:00

board-sdp-flash.c

omap: board-sdp-flash.c: Fix typos in debug output

2010-04-23 15:37:24 -07:00

board-zoom2.c

…

board-zoom3.c

omap2/3/4: ehci: avoid compiler error with touchbook

2010-03-11 09:32:03 -08:00

board-zoom-debugboard.c

omap3: zoom 2/3: Change debugboard serial port id

2010-03-15 16:34:20 -05:00

board-zoom-peripherals.c

omap3: zoom2/3 / 3630sdp: Don't init always all uarts

2010-03-15 16:34:17 -05:00

clkt2xxx_apll.c

OMAP2 clock: split OMAP2420, OMAP2430 clock data into their own files

2010-02-24 12:29:42 -07:00

clkt2xxx_dpllcore.c

…

clkt2xxx_osc.c

…

clkt2xxx_sys.c

…

clkt2xxx_virt_prcm_set.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

clkt34xx_dpll3m2.c

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clkt_clksel.c

OMAP clock: drop RATE_FIXED clock flag

2010-02-24 12:29:43 -07:00

clkt_dpll.c

OMAP2/3/4 clock: fix DPLL multiplier value errors; also copyrights, includes, documentation

2010-02-24 12:15:03 -07:00

clock2xxx.c

OMAP2/3 clock: combine OMAP2 & 3 boot-time MPU rate change code

2010-02-24 17:45:15 -07:00

clock2xxx.h

OMAP2 clock: split OMAP2420, OMAP2430 clock data into their own files

2010-02-24 12:29:42 -07:00

clock3xxx_data.c

OMAP3: clock: fix enable bit used for dpll4_m4x2 clock

2010-03-31 04:16:30 -06:00

clock3xxx.c

OMAP2/3 clock: combine OMAP2 & 3 boot-time MPU rate change code

2010-02-24 17:45:15 -07:00

clock3xxx.h

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock34xx.c

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock34xx.h

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock36xx.c

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock36xx.h

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock44xx_data.c

OMAP4: Clocks: Change SPI Instance Names

2010-04-23 15:35:11 -07:00

clock44xx.h

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock2420_data.c

omap2: add USB initialization for tusb6010

2010-03-11 10:22:39 -08:00

clock2430_data.c

OMAP clock: drop RATE_FIXED clock flag

2010-02-24 12:29:43 -07:00

clock2430.c

OMAP2 clock: split OMAP2420, OMAP2430 clock data into their own files

2010-02-24 12:29:42 -07:00

clock3517.c

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock3517.h

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock_common_data.c

…

clock.c

OMAP2+ clock: revise omap2_clk_{disable,enable}()

2010-02-24 17:45:16 -07:00

clock.h

OMAP4: clock: Add dummy clock nodes for interface clocks

2010-02-24 17:45:17 -07:00

clockdomain.c

OMAP4: prcm: Use logical OR instead of bitwise OR

2010-03-31 04:16:30 -06:00

clockdomains44xx.h

…

clockdomains.h

…

cm4xxx.c

…

cm44xx.h

…

cm-regbits-24xx.h

…

cm-regbits-34xx.h

OMAP3 clock: add support for 192Mhz DPLL4M2 output

2010-02-24 12:15:03 -07:00

cm-regbits-44xx.h

…

cm.c

…

cm.h

OMAP2/3 clock: Extend find_idlest() to pass back idle state value

2010-02-24 12:05:54 -07:00

control.c

omap2/3/4: ioremap omap_globals module

2010-02-23 10:57:40 -08:00

cpuidle34xx.c

OMAP3: cpuidle: Add valid field into C-state parameter passing

2010-02-23 11:05:02 -08:00

devices.c

Merge branch 'devel-stable' into devel

2010-05-17 17:24:04 +01:00

dpll3xxx.c

OMAP2/3/4 clock: fix DPLL multiplier value errors; also copyrights, includes, documentation

2010-02-24 12:15:03 -07:00

emu.c

…

gpmc-nand.c

omap: fix a gpmc nand problem

2010-04-23 15:35:11 -07:00

gpmc-onenand.c

…

gpmc-smc91x.c

…

gpmc.c

…

hsmmc.c

…

hsmmc.h

…

i2c.c

omap: i2c: Fix muxing for command line enabled bus

2010-02-25 14:45:08 -08:00

id.c

Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus

2010-02-24 20:53:03 -08:00

io.c

OMAP4: fix temporary hacks that break multi-omap PM

2010-03-11 15:55:43 -08:00

iommu2.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

irq.c

…

Kconfig

omap: Devkit8000: Add missing package selection

2010-04-23 15:37:24 -07:00

mailbox.c

omap2/3/4: mailbox: remove compiler warning

2010-03-11 14:50:00 -08:00

Makefile

omap4: Fix build break by moving omap_smc1 into a separate .S

2010-03-11 09:38:53 -08:00

Makefile.boot

…

mcbsp.c

Merge branch 'topic/asoc' into for-linus

2010-05-20 12:00:43 +02:00

mux34xx.c

…

mux34xx.h

…

mux.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

mux.h

…

omap3-iommu.c

…

omap44xx-smc.S

omap4: Fix build break when used with gcc-4.4.1 (2009-q3)

2010-04-23 15:35:11 -07:00

omap_hwmod_3xxx_data.c

OMAP hwmod: add hwmod class support

2010-02-24 17:45:14 -07:00

omap_hwmod_2420_data.c

OMAP hwmod: add hwmod class support

2010-02-24 17:45:14 -07:00

omap_hwmod_2430_data.c

OMAP hwmod: add hwmod class support

2010-02-24 17:45:14 -07:00

omap_hwmod_common_data.c

OMAP hwmod: add hwmod class support

2010-02-24 17:45:14 -07:00

omap_hwmod_common_data.h

OMAP hwmod: add hwmod class support

2010-02-24 17:45:14 -07:00

omap_hwmod.c

Merge branch 'devel-stable' into devel

2010-05-17 17:24:04 +01:00

omap-headsmp.S

omap4: Fix build break when used with gcc-4.4.1 (2009-q3)

2010-04-23 15:35:11 -07:00

omap-smp.c

…

opp2xxx.h

…

opp2420_data.c

…

opp2430_data.c

…

pm24xx.c

…

pm34xx.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pm-debug.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pm.h

OMAP3: cpuidle: Add valid field into C-state parameter passing

2010-02-23 11:05:02 -08:00

powerdomain.c

OMAP4: prcm: Use logical OR instead of bitwise OR

2010-03-31 04:16:30 -06:00

powerdomains24xx.h

…

powerdomains34xx.h

OMAP3 PM: Defining .pwrsts_logic_ret field for core power domain structure

2010-02-24 12:05:50 -07:00

powerdomains44xx.h

…

powerdomains.h

…

prcm-common.h

…

prcm.c

OMAP4: prcm: Use logical OR instead of bitwise OR

2010-03-31 04:16:30 -06:00

prm44xx.h

…

prm-regbits-24xx.h

…

prm-regbits-34xx.h

…

prm-regbits-44xx.h

…

prm.h

…

sdram-hynix-h8mbx00u0mer-0em.h

…

sdram-micron-mt46h32m32lf-6.h

…

sdram-numonyx-m65kxxxxam.h

omap3: SDRC: add timing data for Numonyx M65KxxxxAM

2010-02-17 17:23:20 -08:00

sdram-qimonda-hyb18m512160af-6.h

…

sdrc2xxx.c

…

sdrc.c

omap2/3/4: ioremap omap_globals module

2010-02-23 10:57:40 -08:00

sdrc.h

…

serial.c

omap2/3/4: serial: Remove condition for getting uart4_phys

2010-03-15 16:34:16 -05:00

sleep24xx.S

…

sleep34xx.S

OMAP3: PM: Added support for L2 aux ctrl register save and restore

2010-02-23 11:05:07 -08:00

sram34xx.S

…

sram242x.S

…

sram243x.S

…

timer-gp.c

OMAP4: clock: Remove clock hacks from timer-gp.c

2010-02-24 17:45:17 -07:00

timer-mpu.c

omap4: Use irq line defines from irq-44xx.h

2010-02-23 15:29:08 -08:00

usb-ehci.c

USB: omap3: add platform init code for OHCI driver

2010-05-20 13:21:44 -07:00

usb-musb.c

usb: musb: Add extvbus in musb_board_data

2010-05-20 13:21:36 -07:00

usb-tusb6010.c

…