mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
80ae3fa5d6712ef3625eff617f72e190645d6361
linux/drivers/staging
History
Greg Kroah-Hartman 80ae3fa5d6 Merge 2.6.38-rc5 into staging-next 
This is to resolve a merge conflict with:
	drivers/staging/zram/zram_drv.c
as pointed out by Stephen Rothwell

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18 12:11:27 -08:00
..
asus_oled
Staging: Merge 2.6.37-rc5 into staging-next
2010-12-07 10:47:56 -08:00
ath6kl
staging: ath6kl: Remove #define A_OK
2011-02-02 14:34:51 -08:00
bcm
Staging: bcm: Check correct user provided length and fix error code returned
2011-02-04 13:01:02 -08:00
brcm80211
Merge 2.6.38-rc5 into staging-next
2011-02-18 12:11:27 -08:00
comedi
Merge 2.6.38-rc5 into staging-next
2011-02-18 12:11:27 -08:00
cptm1217
staging: clearpad_tm1217 depends on INPUT
2010-11-19 17:17:45 -08:00
crystalhd
drivers/staging: Remove unnecessary casts of pci_get_drvdata
2010-11-16 12:06:47 -08:00
cs5535_gpio
staging: cs5535_gpio: check put_user() return code
2011-01-21 12:35:14 -08:00
cx25821
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-01-10 16:04:53 -08:00
cxt1e1
staging: Fix some incorrect use of positive error codes.
2011-01-21 12:35:50 -08:00
dabusb
Staging: dabusb: fixed coding style issues
2011-01-31 14:12:18 -08:00
dt3155v4l
[media] V4L: remove V4L1 compatibility mode
2010-12-29 08:17:07 -02:00
easycap
staging/easycap: replace NOREADBACK with moduel parameter
2011-02-09 11:59:07 -08:00
echo
…
et131x
staging: et131x: Begin cleaning up the MI registers
2011-02-04 13:01:01 -08:00
frontier
Staging: Merge 2.6.37-rc5 into staging-next
2010-12-07 10:47:56 -08:00
ft1000
staging: ft1000: Remove unnecessary check in write_blk_fifo().
2011-02-09 14:55:51 -08:00
go7007
staging/go7007: remove the BKL
2011-01-31 13:38:15 -08:00
hv
Merge 2.6.38-rc5 into staging-next
2011-02-18 12:11:27 -08:00
iio
Staging: IIO: DDS: AD9832 / AD9835 driver
2011-02-09 14:58:57 -08:00
intel_sst
staging: sst: Fix for dmic capture on v2 pmic
2011-02-02 15:06:14 -08:00
keucr
staging: keucr: Delete use kernel strcmp() & strcpy() from TODO file
2011-01-21 12:16:53 -08:00
line6
staging/line6: Fix sparse warning 'Using plain integer as NULL pointer'
2010-12-08 14:31:01 -08:00
lirc
[media] lirc_zilog: z8 on usb doesn't like back-to-back i2c_master_send
2011-01-31 12:18:42 -02:00
memrar
Staging: sep: handle the memrar stuff in the headers
2010-11-29 11:17:27 -08:00
msm
Staging: Merge branch 'staging-next' into 2.6.38-rc3
2011-02-02 13:35:58 -08:00
octeon
staging: octeon: change a typo comamnd to command
2011-02-04 13:01:03 -08:00
olpc_dcon
staging: olpc_dcon: actually return the value of i2c_add_driver
2011-02-09 12:11:54 -08:00
panel
…
phison
Staging: phison: use DEFINE_PCI_DEVICE_TABLE
2010-12-09 16:29:48 -08:00
pohmelfs
staging: pohmelfs: Fix some typos, and comments.
2011-02-04 13:01:02 -08:00
quatech_usb2
…
quickstart
Staging: quickstart: fixed coding style issues
2011-02-09 12:11:55 -08:00
rt2860
staging: rt2860: cmm_mac_pci.c change a typo comamnd to command
2011-02-04 13:01:03 -08:00
rt2870
…
rtl8187se
staging: rtl8187se: Change panic to warn when RF switch turned off
2010-11-16 12:25:53 -08:00
rtl8192e
staging: rtl8192e: Factor out common code
2011-02-09 11:50:21 -08:00
rtl8192u
rtl8192u_usb: Remove built-in firmware images
2011-01-21 12:19:11 -08:00
rtl8712
Staging: rtl8712: fix math errors in snprintf()
2011-02-09 11:51:27 -08:00
rts_pstor
Staging: rts_pstor: fix read past end of buffer
2011-02-09 12:11:55 -08:00
samsung-laptop
Staging: samsung-laptop: add a bunch more laptop DMI signatures
2011-02-09 13:19:03 -08:00
sbe-2t3e3
…
se401
[media] staging: se401 depends on USB
2010-12-30 22:29:41 -02:00
sep
staging: sep: Further tidying
2011-02-01 06:27:13 -08:00
serqt_usb2
…
slicoss
…
sm7xx
console: rename acquire/release_console_sem() to console_lock/unlock()
2011-01-26 10:50:06 +10:00
solo6x10
staging: solo6010 depends on I2C
2010-12-09 16:29:49 -08:00
speakup
staging: speakup: enlosed macros with complex values in parenthesis
2011-02-04 13:01:02 -08:00
spectra
staging: spectra: don't read past array in Conv_Spare_Data_Log2Phy_Format()
2011-01-21 12:13:07 -08:00
ste_rmi4
Staging: Merge branch 'staging-next' into 2.6.38-rc3
2011-02-02 13:35:58 -08:00
ti-st
drivers:staging: ti-st: delete old bt_drv driver
2011-01-20 15:58:17 -08:00
tidspbridge
staging: tidspbridge: set12 remove hungarian from structs
2011-02-04 20:12:30 -06:00
tm6000
Staging: Merge branch 'staging-next' into 2.6.38-rc3
2011-02-02 13:35:58 -08:00
usbip
staging: usbip: vhci: use urb->dev->portnum to find port
2011-01-20 16:01:50 -08:00
usbvideo
staging: usbvideo: vicam: Fix build in -next
2011-02-01 06:27:13 -08:00
vme
Delete zero-length drivers/staging/vme/bridges/Module.symvers
2011-01-28 03:23:42 -05:00
vt6655
staging/vt6655: fix sparse warning "obsolete struct initializer"
2011-01-21 12:31:16 -08:00
vt6656
vt6656: Use request_firmware() to load firmware
2011-01-21 12:19:11 -08:00
westbridge
Staging: Westbridge: added ioremap_nocache instead of phys_to_virt
2011-02-04 13:04:23 -08:00
winbond
Staging: w35und: Kill struct wb_usb
2010-12-01 14:45:47 -08:00
wlags49_h2
drivers/staging: Remove unnecessary casts of pci_get_drvdata
2010-11-16 12:06:47 -08:00
wlags49_h25
…
wlan-ng
Staging: wlan-ng: fixed packed checkpatch warnings
2011-02-04 13:04:24 -08:00
xgifb
Staging: xgfib: put parenthesis in the right place
2011-01-20 12:01:23 -08:00
zcache
staging: zcache: misc build/config
2011-02-09 15:08:22 -08:00
zram
Merge 2.6.38-rc5 into staging-next
2011-02-18 12:11:27 -08:00
Kconfig
staging: zcache: misc build/config
2011-02-09 15:08:22 -08:00
Makefile
staging: zcache: misc build/config
2011-02-09 15:08:22 -08:00
staging.c
…