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
..
boot	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
common	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
configs	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
include/asm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
kernel	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-05-19 11:37:22 -07:00
lib	ARM: 6110/1: Fix Thumb-2 kernel builds when UACCESS_WITH_MEMCPY is enabled	2010-05-08 10:45:26 +01:00
mach-aaec2000
mach-at91	ARM: remove 'select GENERIC_TIME'	2010-05-18 08:17:56 +01:00
mach-bcmring	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
mach-clps711x	ARM: Remove useless linux/bootmem.h includes	2010-05-15 15:03:48 +01:00
mach-cns3xxx
mach-davinci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
mach-dove
mach-ebsa110
mach-ep93xx	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
mach-footbridge
mach-gemini
mach-h720x
mach-integrator	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
mach-iop13xx
mach-iop32x	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
mach-iop33x
mach-ixp4xx	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695
mach-l7200
mach-lh7a40x
mach-loki
mach-mmp	[ARM] mmp: append device support in jasper	2010-05-11 17:25:06 +02:00
mach-msm	msm: 7x30 Kconfig and makefile changes	2010-05-13 16:08:55 -07:00
mach-mv78xx0
mach-mx1
mach-mx2	can: sja1000 platform data fixes	2010-05-17 22:39:48 -07:00
mach-mx3	can: sja1000 platform data fixes	2010-05-17 22:39:48 -07:00
mach-mx5
mach-mx25
mach-mxc91231
mach-netx
mach-nomadik	ARM: 6104/1: nomadik-gpio: use clk API	2010-05-06 20:17:20 +01:00
mach-ns9xxx
mach-nuc93x
mach-omap1	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
mach-omap2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
mach-orion5x
mach-pnx4008
mach-pxa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
mach-realview	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
mach-rpc
mach-s3c24a0/include/mach
mach-s3c64xx	ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration	2010-05-19 18:25:30 +09:00
mach-s3c2400
mach-s3c2410	ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen	2010-05-19 18:25:22 +09:00
mach-s3c2412	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
mach-s3c2416	ARM: SMDK2416: Add support for framebuffer device and ensure correct setup	2010-05-18 18:46:30 +09:00
mach-s3c2440	ARM: Merge for-2635/gpio2	2010-05-19 18:04:08 +09:00
mach-s3c2443	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
mach-s5p6440	ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories	2010-05-19 18:16:04 +09:00
mach-s5p6442	ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories	2010-05-19 18:16:04 +09:00
mach-s5pc100	ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100	2010-05-19 18:23:37 +09:00
mach-s5pv210	ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories	2010-05-19 18:16:04 +09:00
mach-sa1100
mach-shark
mach-shmobile	ARM: remove 'select GENERIC_TIME'	2010-05-18 08:17:56 +01:00
mach-spear3xx
mach-spear6xx
mach-stmp37xx
mach-stmp378x
mach-u300	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
mach-ux500	ARM: 6104/1: nomadik-gpio: use clk API	2010-05-06 20:17:20 +01:00
mach-versatile	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
mach-vexpress
mach-w90x900
mm	Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux	2010-05-19 11:49:33 -07:00
nwfpe	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
oprofile	ARM: 6074/1: oprofile: convert from sysdev to platform device	2010-05-17 11:53:59 +01:00
plat-iop
plat-mxc	V4L/DVB: mx1-camera: compile fix	2010-05-06 19:20:51 -03:00
plat-nomadik	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
plat-omap	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
plat-orion
plat-pxa	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
plat-s3c24xx	ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen	2010-05-19 18:25:22 +09:00
plat-s5p	ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move	2010-05-19 18:22:47 +09:00
plat-s5pc1xx	ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100	2010-05-19 18:23:37 +09:00
plat-samsung	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
plat-spear
plat-stmp3xxx
plat-versatile
tools
vfp
Kconfig	Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci	2010-05-19 12:08:50 -07:00
Kconfig-nommu
Kconfig.debug
Makefile	Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux	2010-05-19 11:49:33 -07:00