OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/staging
History
Greg Kroah-Hartman b91867f2ee Merge tag 'staging-3.3-rc3' into staging-next 
This was done to resolve some merge issues with the following files that
had changed in both branches:
	drivers/staging/rtl8712/rtl871x_sta_mgt.c
	drivers/staging/tidspbridge/rmgr/drv_interface.c
	drivers/staging/zcache/zcache-main.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 		2012-02-10 10:58:25 -08:00
..
android Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
asus_oled Staging: asus_oled: fix NULL-ptr crash on unloading 2012-02-08 14:14:13 -08:00
bcm Staging: bcm: fix CodingStyle warnings/errors reported by checkpatch.pl in led_control.h 2012-02-10 09:58:52 -08:00
comedi Staging: comedi: logical || vs bitwise | 2012-02-09 10:02:22 -08:00
cptm1217
…
crystalhd staging: precedence bug in crystalhd_stop_tx_dma_engine() 2012-02-09 09:13:55 -08:00
cxt1e1 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
echo
…
et131x staging: et131x: Revert changes from previous commit 2011-12-08 15:03:11 -08:00
frontier Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
ft1000 Staging: ft1000: ft1000-pcmia: fix space required after that ', ' in ft1000_proc.c 2012-02-09 09:44:35 -08:00
hv Staging: hv: storvsc: Consolidate all the wire protocol definitions 2012-02-08 17:07:39 -08:00
iio staging:iio:adc:adt7310/7410 sticking plaster fix for broken event attrs. 2012-02-09 10:06:06 -08:00
keucr Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
line6 staging: line6: separate handling of buffer allocation and stream startup 2012-02-09 09:14:35 -08:00
media Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
mei staging/mei: TODO : how to handle example code after unstaging 2012-02-09 09:44:58 -08:00
nvec staging: nvec: Fix Kconfig dependencies 2012-01-31 10:28:00 -08:00
octeon MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
olpc_dcon Staging: olpc_dcon.c: obsolete use of strict_stroul 2011-12-08 15:01:49 -08:00
omapdrm Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
panel
…
phison staging/phison: Convert pci_table entries to PCI_DEVICE (if PCI_ANY_ID is used) 2011-11-28 04:24:32 +09:00
quatech_usb2 module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
quickstart Staging: quickstart: Use pr_err and pr_info for logs 2012-02-09 09:41:33 -08:00
rtl8187se
…
rtl8192e drivers/staging: adjust double test 2012-02-09 09:13:55 -08:00
rtl8192u staging: Fix typo in ieee80211_rx.c 2012-02-09 09:51:17 -08:00
rtl8712 Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
rts5139 staging: rts5139: fix pointer coding style 2012-02-09 09:41:34 -08:00
rts_pstor Merge branch 'master' into pm-sleep 2011-12-21 21:59:45 +01:00
sbe-2t3e3 Staging: sbe-2t3e3: logical || vs bitwise | 2012-02-09 09:51:17 -08:00
sep staging: sep: reworked crypto layer 2012-02-10 10:09:58 -08:00
serial
…
serqt_usb2 module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
slicoss
…
sm7xx staging/sm7xx: Convert pci_table entries to PCI_DEVICE (if PCI_ANY_ID is used) 2011-11-28 04:24:32 +09:00
speakup module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
ste_rmi4
…
telephony telephony: Move to staging 2012-02-08 16:58:04 -08:00
tidspbridge Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
usbip Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
vme staging: vme: code convention fix 2012-02-09 09:16:52 -08:00
vt6655 Staging: vt6655: Fix brace coding style issues in ioctl.c 2012-02-09 09:19:21 -08:00
vt6656 staging, vt6656/wpactl.c: Fix mem leak in wpa_ioctl() 2012-02-09 09:20:06 -08:00
winbond
…
wlags49_h2 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2012-01-09 12:18:17 -08:00
wlags49_h25
…
wlan-ng Staging: wlan-ng: cap the ssid length 2012-02-09 09:51:47 -08:00
xgifb staging/xgifb: remove remaining duplicate initdef.h defines 2012-02-10 09:56:25 -08:00
zcache Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
zram staging: zram: remove xvmalloc 2012-02-08 17:13:01 -08:00
zsmalloc staging: zsmalloc: zsmalloc memory allocation library 2012-02-08 17:12:53 -08:00
Kconfig Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
Makefile Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
staging.c
…