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
..
ABI	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
accounting
acpi
aoe
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
auxdisplay
blackfin	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
block
blockdev
cdrom
cgroups	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
connector	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
console
cpu-freq
cpuidle
cris
crypto
development-process
device-mapper
DocBook	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
driver-model
dvb	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
early-userspace
fault-injection
fb	fbdev: rename imacfb.txt to efifb.txt and change imacfb to efifb.	2010-04-07 08:38:02 -07:00
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
firmware_class
frv
hwmon	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
i2c	i2c-core: Erase pointer to clientdata on removal	2010-05-04 11:09:27 +02:00
i2o
ia64
ide
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
ioctl	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2010-03-19 09:43:06 -07:00
isdn
ja_JP
kbuild	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
kdump
ko_KR
kvm
laptops	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
lguest	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
m68k
make
mips
misc-devices
mn10300
mtd
namespaces
netlabel	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
networking	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
parisc
PCI	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
pcmcia	pcmcia: dev_node removal (core)	2010-05-10 10:23:17 +02:00
power	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
powerpc	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
pps
prctl
RCU	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-18 08:27:54 -07:00
s390
scheduler	sched: Remove USER_SCHED from documentation	2010-04-02 20:12:01 +02:00
scsi	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
serial
sh
sound	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
sparc
spi	spi: spidev_test gives error upon 1-byte transfer	2010-04-29 16:40:30 -06:00
sysctl	net: Consistent skb timestamping	2010-05-15 23:57:10 -07:00
telephony
thermal
timers
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
uml
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
video4linux	V4L/DVB: saa7134: Add support new Behold TV cards	2010-05-19 12:58:41 -03:00
vm	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
w1	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
watchdog	[WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl.	2010-04-06 14:23:55 +00:00
wimax
x86
zh_CN
00-INDEX	Add a document describing the padata interface	2010-05-14 09:18:55 -06:00
applying-patches.txt
atomic_ops.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
cachetlb.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
Changes	netfilter: xtables: remove xt_string revision 0	2010-03-25 17:04:57 +01:00
circular-buffers.txt	Document Linux's circular buffering capabilities	2010-03-24 16:31:22 -07:00
CodingStyle
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
credentials.txt	CRED: Holding a spinlock does not imply the holding of RCU read lock	2010-04-27 08:49:03 +10:00
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt
DMA-API-HOWTO.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
DMA-API.txt
DMA-attributes.txt
DMA-ISA-LPC.txt
dmaengine.txt
dontdiff
dynamic-debug-howto.txt
edac.txt
eisa.txt
email-clients.txt
feature-removal-schedule.txt	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt
highuid.txt
HOWTO	Documentation/HOWTO: update git home URL	2010-04-22 15:24:56 -07:00
hw_random.txt
init.txt
initrd.txt
intel_txt.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
IO-mapping.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
kernel-parameters.txt	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-05-20 09:45:38 -07:00
keys-request-key.txt
keys.txt
kmemcheck.txt
kmemleak.txt
kobject.txt	kobject: documentation: Update to refer to kset-example.c.	2010-03-19 07:12:20 -07:00
kprobes.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
kref.txt
ldm.txt
leds-class.txt
leds-lp3944.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
logo.gif
logo.txt
magic-number.txt
Makefile
ManagementStyle
mca.txt
md.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
memory-barriers.txt	Document Linux's circular buffering capabilities	2010-03-24 16:31:22 -07:00
memory-hotplug.txt
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt	Add a document describing the padata interface	2010-05-14 09:18:55 -06:00
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rt-mutex-design.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
slow-work.txt
SM501.txt
Smack.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
sparse.txt	doc: Change urls for sparse	2010-04-27 22:59:07 +02:00
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt	Documentation: -stable rules: upstream commit ID requirement reworded	2010-04-22 15:24:56 -07:00
SubmitChecklist
SubmittingDrivers
SubmittingPatches
svga.txt
sysfs-rules.txt	Fix typos in comments	2010-03-16 11:47:56 +01:00
sysrq.txt	Input: Documentation/sysrq.txt - update KEY_SYSRQ info	2010-05-19 10:14:15 -07:00
tomoyo.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
volatile-considered-harmful.txt	Documentation/volatile-considered-harmful.txt: correct cpu_relax() documentation	2010-03-24 16:31:20 -07:00
zorro.txt