[XFS] Fix merge failures
[pandora-kernel.git] / drivers / usb /
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-29 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28 James MorrisMerge branch 'next' into for-linus
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-12-28 Linus TorvaldsMerge branch 'sched-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'tracing-core-for-linus' of git://git...
2008-12-28 Linus TorvaldsMerge branch 'x86-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2008-12-25 Ingo MolnarMerge branch 'sched/urgent'; commit 'v2.6.28' into...
2008-12-25 Ingo MolnarMerge branch 'x86/tsc' into tracing/core
2008-12-25 Takashi IwaiMerge branch 'topic/udev-id-rename' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/sound-core-fix' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/pcxhr-update' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/oxygen' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/cs5535audio' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/convert-tasklet' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/ca0106' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/audigy-capture-boost' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/asoc' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-25 James MorrisMerge branch 'next' into for-linus
2008-12-24 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-12-24 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-12-24 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-24 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-23 Ingo MolnarMerge branch 'x86/iommu' into x86/core
2008-12-23 Ingo MolnarMerge branch 'x86/tsc' into x86/core
2008-12-23 Ingo MolnarMerge branch 'x86/ptrace' into x86/tsc
2008-12-23 Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-23 Ingo MolnarMerge branch 'x86/apic' into x86/irq
2008-12-23 Ingo MolnarMerge commit 'v2.6.28-rc9' into x86/apic
2008-12-22 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-12-22 Paul Mundtusb: Fix up sh_mobile usbf clock framework warnings.
2008-12-22 Magnus Dammsh: sh_mobile usb clock framework support
2008-12-22 Magnus Dammsh: sh_mobile usbf clock framework support
2008-12-22 Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-spdif-stream' into topic...
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-resume' into topic/ca0106
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-capture-no-44khz' into topic...
2008-12-20 Takashi IwaiMerge branch 'topic/hda-resume-fix' into topic/hda
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-20 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-12-19 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-12-19 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-19 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-19 Takashi IwaiMerge branch 'fix/asoc' into for-linus
2008-12-19 Takashi IwaiMerge branch 'fix/asoc' into topic/asoc
2008-12-19 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/ring-buffer...
2008-12-19 Takashi IwaiMerge branch 'topic/hda-doc' into topic/hda
2008-12-19 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-18 Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18 Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-12-18 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-18 Paul MackerrasMerge branch 'linux-2.6' into next
2008-12-17 Rémi Denis-CourmontPhonet: USB CDC Phonet function for gadget framework
2008-12-17 Linus TorvaldsMerge branch 'i2c-fixes' of git://aeryn.fluff.org.uk...
2008-12-17 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-12-17 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/usb-2.6
2008-12-17 Mike ProvencherUSB: pl2303: add id for Hewlett-Packard LD220-HP POS...
2008-12-17 Oliver NeukumUSB: set correct configuration in probe of ti_usb_3410_5052
2008-12-17 Matthew ArnoldUSB: add 5372:2303 to pl2303
2008-12-17 Alan SternUSB: skip Set-Interface(0) if already in altsetting 0
2008-12-17 David BrownellUSB: gadget: fix rndis working at high speed
2008-12-17 Andrew EwertUSB: ftdi_sio: Adding Ewert Energy System's CANdapter PID
2008-12-17 Alan CoxUSB: tty: SprogII DCC controller identifiers
2008-12-17 Alan Sternusb-storage: update unusual_devs entry for Nokia 5310
2008-12-17 Ozan SenerUSB: Unusual devs patch for Nokia 3500c
2008-12-17 CSÉCSY LászlóUSB: storage: unusual_devs.h: Nokia 3109c addition
2008-12-17 Greg Kroah-HartmanUSB: fix problem with usbtmc driver not loading properly
2008-12-17 Paul MackerrasMerge branch 'next' of /linux/kernel/git/jwboyer/powerp...
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/uv
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/doc
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/cpufeature
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16 Paul MackerrasMerge branch 'merge' into next
2008-12-16 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-12-15 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-13 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/irq
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into sched/core
2008-12-10 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-12-10 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2008-12-09 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-09 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-09 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
next