OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/staging
History
Linus Torvalds 3e5b08cbbf Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
  USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
  USB: serial: ftdi_sio: add support for TIOCSERGETLSR
  USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
  USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
  usb: ehci-omap: fix tll channel enable mask
  usb: ohci-omap3: fix trivial typo
  USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
  USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
  USB: gadget: update ci13xxx to work with g_ether
  USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
  Revert "USB: musb: pm: don't rely fully on clock support"
  Revert "USB: musb: blackfin: pm: make it work"
  USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
  USB: uas: Ensure we only bind to a UAS interface
  USB: uas: Rename sense pipe and sense urb to status pipe and status urb
  USB: uas: Use kzalloc instead of kmalloc
  USB: uas: Fix up the Sense IU
  usb: musb: core: kill unneeded #include's
  DA8xx: assign name to MUSB IRQ resource
  usb: gadget: g_ncm added
  ...

Manually fix up trivial conflicts in USB Kconfig changes in:
	arch/arm/mach-omap2/Kconfig
	arch/sh/Kconfig
	drivers/usb/Kconfig
	drivers/usb/host/ehci-hcd.c
and annoying chip clock data conflicts in:
	arch/arm/mach-omap2/clock3xxx_data.c
	arch/arm/mach-omap2/clock44xx_data.c
 		2011-01-07 13:16:28 -08:00
..
adis16255 staging: adis16255: fix sysfs leak 2010-08-31 14:51:53 -07:00
asus_oled Staging: asus_oled: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:18 -08:00
ath6kl Staging: ath6kl: Fix pointer casts on 64-bit architectures 2010-11-09 16:49:02 -08:00
autofs fs: rcu-walk aware d_revalidate method 2011-01-07 17:50:29 +11:00
batman-adv Staging: batman-adv: ensure that eth_type_trans gets linear memory 2010-11-29 10:53:14 -08:00
bcm Merge branch 'usb-next' into musb-merge 2010-12-16 10:05:06 -08:00
brcm80211 staging: brcm80211: updated maintainers contact information 2010-11-29 10:53:14 -08:00
comedi staging: comedi: fix memory leak 2010-11-16 12:25:52 -08:00
crystalhd Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
cx25821 [media] cx25821: Fix compilation breakage due to BKL dependency 2011-01-05 13:41:40 -02:00
cxt1e1 Staging: cxt1e1: multiple definition of max_mtu fix 2010-10-19 10:12:14 -07:00
dabusb [media] dabusb: Move it to staging to be deprecated 2010-12-29 08:17:15 -02:00
dt3155v4l [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
easycap staging: easycap needs smp_lock.h, fixes build error 2010-11-29 10:53:14 -08:00
echo staging: trivial: fix typo "seperate" 2010-05-14 13:16:10 -07:00
et131x Staging: et131x: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:49 -07:00
frontier Staging: frontier: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:18 -08:00
ft1000 drivers/staging: delete double assignment 2010-11-09 14:05:22 -08:00
go7007 [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
hv SCSI host lock push-down 2010-11-16 13:33:23 -08:00
iio Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:19 -08:00
intel_sst Merge branch 'master' into work 2010-11-29 10:44:22 -08:00
keucr SCSI host lock push-down 2010-11-16 13:33:23 -08:00
line6 Staging: line6: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:20 -08:00
lirc [media] staging/lirc: Update lirc TODO files 2010-12-30 12:17:21 -02:00
memrar llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
msm staging: Final semaphore cleanup 2010-10-30 12:12:50 +02:00
octeon Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
olpc_dcon i2c: Drivers shouldn't include <linux/i2c-id.h> 2010-11-15 22:40:38 +01:00
panel llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
phison Staging: phison: fix problem caused by libata change 2010-10-09 13:26:12 -07:00
pohmelfs fs: icache RCU free inodes 2011-01-07 17:50:26 +11:00
quatech_usb2 staging/trivial: fix typos concerning "initiali[zs]e" 2010-09-04 21:23:26 -07:00
quickstart Staging: quickstart: free after input_unregister_device() 2010-11-16 12:25:52 -08:00
rt2860 Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN 2010-11-29 11:48:29 -08:00
rt2870 Staging: rt2870: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:46 -07:00
rtl8187se staging: rtl8187se: Change panic to warn when RF switch turned off 2010-11-16 12:25:53 -08:00
rtl8192e Staging: rtl8192e: fix IOMMU memory leak 2010-11-09 14:05:23 -08:00
rtl8192u Staging: rtl8192u: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:42 -07:00
rtl8712 Merge branch 'master' into work 2010-11-29 10:44:22 -08:00
samsung-laptop Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:19 -08:00
sbe-2t3e3 Staging: sbe-2t3e3: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
se401 [media] staging: se401 depends on USB 2010-12-30 22:29:41 -02:00
serqt_usb2 Staging: serqt_usb2: fix space coding style issue in serqt_usb2.c 2010-05-11 11:35:54 -07:00
slicoss staging: slicoss: use free_netdev(netdev) instead of kfree() 2010-09-30 04:14:21 -07:00
sm7xx staging: sm7xx: call disable_pci_device() if pci_probe() failed 2010-08-31 14:48:09 -07:00
smbfs fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
solo6x10 Staging: solo6x10: fix build problem 2010-11-02 08:39:05 -07:00
speakup Merge branch 'master' into work 2010-11-29 10:44:22 -08:00
spectra staging: spectra: fix build error 2010-11-17 11:57:43 -08:00
ti-st staging: ti-st: move TI_ST from staging to misc/ 2010-10-06 08:25:06 -07:00
tidspbridge OMAP2+: powerdomain: move header file from plat-omap to mach-omap2 2010-12-21 21:05:16 -07:00
tm6000 [media] tm6000: Fix mutex unbalance 2010-12-29 08:17:21 -02:00
usbip Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
usbvideo [media] staging: usbvideo/vicam depends on USB 2010-12-30 22:29:39 -02:00
vme Staging: vme: Assure D16 cycle if required in master_read and master_write 2010-09-30 04:33:26 -07:00
vt6655 Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
vt6656 staging: vt6656: implement missing brackets 2010-11-09 14:05:23 -08:00
westbridge drivers/staging: delete double assignment 2010-11-09 14:05:22 -08:00
winbond staging: fix winbond build, needs delay.h 2010-11-19 10:13:56 -08:00
wlags49_h2 Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
wlags49_h25 Staging: wlags49_h25: Makefile: cleaned up Makefile cflag lines 2010-10-05 11:56:38 -07:00
wlan-ng Staging: wlan-ng: Fix wrong #ifdef #endif sequence 2010-11-09 16:51:42 -08:00
xgifb Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
zram Revert "Staging: zram: work around oops due to startup ordering snafu" 2010-12-30 12:07:22 -08:00
Kconfig Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-01-06 18:32:12 -08:00
Makefile Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-01-06 18:32:12 -08:00
staging.c Staging: workaround build system bug 2008-10-13 14:32:52 -07:00