linux/drivers/staging
Greg Kroah-Hartman 829455bb0e Merge 3.10-rc3 into staging-next
We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-27 10:54:33 +09:00
..
android Merge 3.10-rc3 into staging-next 2013-05-27 10:54:33 +09:00
asus_oled staging/asus_oled: Fixed up incorrect formatted comments. 2013-05-21 10:30:10 -07:00
bcm Staging: bcm: fix checkpatch errors and warnings in Version.h 2013-05-21 19:59:50 -07:00
btmtk_usb staging: btmtk_usb: remove unused including <linux/version.h> 2013-05-21 10:54:45 -07:00
ced1401 Staging: ced1401: Staticize local symbols 2013-05-22 15:31:39 -07:00
comedi Merge 3.10-rc3 into staging-next 2013-05-27 10:54:33 +09:00
cptm1217 staging: cptm1217: don't call input_free_device() after input_unregister_device() 2013-05-13 17:50:05 -04:00
crystalhd staging/crystalhd: Fixes line over 80 characters warning in bc_dts_glob_lnx.h 2013-05-13 14:24:22 -07:00
csr Staging:csr - Fixes whitespace around commas in unifi_sme.h. 2013-05-13 13:58:04 -07:00
cxt1e1 Staging/cxt1e1:Removing parantheses surrounding return argument 2013-05-22 15:28:30 -07:00
dgrp staging: for dgrp, let nd_ps_desc always NUL terminated string within MAX_DESC_LEN length 2013-05-13 18:08:16 -04:00
dwc2 Merge 3.10-rc3 into staging-next 2013-05-27 10:54:33 +09:00
echo staging: echo: Fixed camel-case variable names 2013-05-13 13:39:31 -07:00
et131x staging: et131x: cancel_work when module gets unloaded 2013-04-11 13:07:05 -07:00
frontier staging/frontier: Fixed up incorrect formatted comments 2013-05-21 10:30:10 -07:00
ft1000 staging: fixed else format in ft1000_debug.c 2013-05-17 15:54:57 -07:00
fwserial TTY/Serial driver update for 3.10-rc1 2013-04-29 12:16:17 -07:00
gdm72xx Merge 3.10-rc3 into staging-next 2013-05-27 10:54:33 +09:00
goldfish staging/goldfish: Fixed up incorrect formatted comments. 2013-05-21 10:30:10 -07:00
iio Merge 3.10-rc3 into staging-next 2013-05-27 10:54:33 +09:00
imx-drm Merge 3.10-rc3 into staging-next 2013-05-27 10:54:33 +09:00
keucr keucr: fixes line over 80 characters warning 2013-05-19 21:13:17 -07:00
line6 staging: line6: pod.c: fix checkpatch warning 2013-03-11 09:47:13 -07:00
lustre staging: lustre: fix to use list_for_each_entry_safe() when delete items 2013-05-17 15:05:07 -07:00
media staging/solo6x10: depend on CONFIG_FONTS 2013-05-16 15:37:50 -07:00
netlogic Staging: netlogic: remove unused variable in xlr_net_start_xmit() 2013-03-14 15:03:56 -07:00
nvec Merge 3.10-rc3 into staging-next 2013-05-27 10:54:33 +09:00
octeon
olpc_dcon staging: olpc_dcon: return NOTIFY_DONE instead of the 0. 2013-03-25 11:02:55 -07:00
ozwpan staging: ozwpan: Revert last changes 2013-05-24 15:25:53 -07:00
panel Staging: Panel: panel: Fixed checkpatch line length warnings 2013-05-16 16:01:46 -07:00
phison
quickstart
rtl8187se staging: single_open() leaks 2013-05-05 00:15:43 -04:00
rtl8192e staging: rtl8192e: Use kmemdup for duplicating memory 2013-05-15 14:23:41 -04:00
rtl8192u rtl8192u: add space after '}' in r8192U_core.c 2013-05-22 19:28:19 -07:00
rtl8712 rtl8712: remove redundant if statement 2013-03-11 09:49:55 -07:00
rts5139 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
sb105x staging/sb105x: remove asm/segment.h dependency 2013-05-16 16:01:46 -07:00
sbe-2t3e3
sep staging: sep: fix driver build and kconfig 2013-05-16 15:37:49 -07:00
serqt_usb2 TTY: add tty_port_tty_wakeup helper 2013-03-18 16:19:45 -07:00
silicom Staging: silicom: Fixed warning 'preferred seq_puts instead of seq_printf'. 2013-05-16 15:53:36 -07:00
slicoss staging: slicoss: fix error return code in slic_entry_probe() 2013-05-13 18:02:28 -04:00
sm7xxfb staging/sm7xxfb: Convert to SIMPLE_DEV_PM_OPS 2013-03-11 09:23:43 -07:00
speakup staging: speakup: fix warnings by adding __user annotations 2013-05-22 15:35:52 -07:00
ste_rmi4 staging: ste_rmi4: Suppress 'ignoring return value of ‘regulator_enable()' warning 2013-05-16 15:37:49 -07:00
ti-soc-thermal staging: ti-soc-thermal: remove external heat while extrapolating hotspot 2013-05-13 18:02:30 -04:00
tidspbridge Staging: tidspbridge: _tiomap.h: fixed indentation warning. 2013-05-21 19:57:39 -07:00
usbip staging: usbip: Renaming pr_warning function 2013-05-13 13:39:31 -07:00
vme staging: vme: fix error return code in vme_user_probe() 2013-05-13 17:34:22 -04:00
vt6655 staging: vt6655: Use alloc_etherdev() for kzalloc 2013-05-17 15:05:07 -07:00
vt6656 Merge 3.10-rc3 into staging-next 2013-05-27 10:54:33 +09:00
winbond
wlags49_h2 staging: wlags49_h2: fix error return code in wl_adapter_insert() 2013-05-17 15:05:07 -07:00
wlags49_h25
wlan-ng wlan-ng: replace calls to kmalloc and memcpy with kmemdup 2013-05-13 14:01:26 -07:00
xgifb staging/xgifb: Remove dead assignments/increments 2013-05-17 15:47:18 -07:00
zcache staging: ramster: add how-to document 2013-05-20 08:21:04 -07:00
zram Staging: Fixes string split across lines in zram 2013-05-20 10:43:11 -07:00
zsmalloc staging/zsmalloc: Fixed up incorrect formatted comments 2013-05-21 10:30:10 -07:00
Kconfig Merge 3.10-rc3 into staging-next 2013-05-27 10:54:33 +09:00
Makefile Staging: add USB MTK bluetooth driver 2013-05-16 15:43:48 -07:00
staging.c