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/plat	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
clock.c	OMAP4: clock: Add dummy clock nodes for interface clocks	2010-02-24 17:45:17 -07:00
common.c	omap: delete unused bootloader tag variables	2010-04-23 15:37:24 -07:00
cpu-omap.c	OMAP clock/CPUFreq: add clk_exit_cpufreq_table()	2010-01-08 15:23:16 -07:00
debug-devices.c	omap: use smc91x_platdata to setup smc91x	2009-12-11 16:16:33 -08:00
debug-leds.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
devices.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
dma.c	Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2010-04-27 08:27:26 -07:00
dmtimer.c	omap4: Use irq line defines from irq-44xx.h	2010-02-23 15:29:08 -08:00
fb.c	OMAP: DSS2: omapfb driver	2009-12-09 12:12:44 +02:00
gpio.c	omap: gpio: fix incorrect matching of IRQ_TYPE_EDGE_BOTH	2010-04-22 17:32:36 -07:00
i2c.c	i2c-omap: add mpu wake up latency constraint in i2c	2010-05-20 00:18:59 +01:00
io.c	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
iommu-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
iommu.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
iopgtable.h	omap iommu: cleanup iommu page address mask and definitions	2010-02-15 10:03:32 -08:00
iovmm.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
Kconfig	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
mailbox.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
Makefile	OMAP2/3/4 core: create omap_device layer	2009-09-03 20:14:05 +03:00
mcbsp.c	Merge branch 'topic/asoc' into for-linus	2010-05-20 12:00:43 +02:00
mux.c	omap: mux: Add new style pin multiplexing code for omap3	2009-12-11 16:16:32 -08:00
ocpi.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
omap_device.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
omap-pm-noop.c	omap: headers: Move remaining headers from include/mach to include/plat	2009-10-20 09:40:47 -07:00
sram.c	omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3	2010-02-15 09:27:02 -08:00
usb.c	omap1: Add omap7xx USB support	2009-12-11 16:16:34 -08:00