Greg Kroah-Hartman 17cb3be61b Merge branch 'staging-linus' into staging-next ... This is to get the comedi fixes, and resolve the issue in comdi_test.c and comedi_fops.c that were caused by changes in both branches. It also allows the fwserial driver changes to be applied, as they required the fixes that are in staging-linus. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-01-07 15:17:52 -08:00
..
android	staging: android: Add some Kconfig help entries	2013-01-07 14:59:57 -08:00
asus_oled
bcm	Staging: bcm: Fix warning: "Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ..."	2013-01-07 10:57:51 -08:00
ccg	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
ced1401	staging: ced1401: Fix typo in staging/ced1401	2012-11-26 16:21:58 -08:00
comedi	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
cptm1217
crystalhd
csr	staging/csr: Fix dereference before check	2013-01-07 14:56:04 -08:00
cxt1e1
dgrp	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
echo	staging: echo.c: fix memory leakage	2013-01-07 14:03:32 -08:00
et131x	staging: et131x: Use register defines instead of magic numbers	2013-01-07 14:03:32 -08:00
frontier
ft1000	Staging: ft1000-usb: Fix call to obsolete function	2013-01-07 12:33:45 -08:00
fwserial	staging/fwserial: Update TODO file per reviewer comments	2013-01-07 11:16:49 -08:00
gdm72xx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-12 12:22:13 -08:00
iio	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
imx-drm	staging: drm/imx: fix double free bug in error path	2013-01-07 12:27:52 -08:00
keucr	staging: keucr: Fix parens/braces	2013-01-07 12:59:25 -08:00
line6	staging: line6: delete an unused function	2013-01-07 14:00:35 -08:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-12-13 19:22:22 -08:00
net
nvec	ARM: arm-soc: Cleanups on various subarchitectures	2012-12-12 11:51:39 -08:00
octeon
olpc_dcon
omap-thermal	staging: omap-thermal: fix error check in omap_thermal_expose_sensor() and in omap_thermal_register_cpu_cooling().	2013-01-07 14:53:58 -08:00
omapdrm	staging: drm/omap: fix flags in dma buf exporting	2013-01-07 12:27:03 -08:00
ozwpan
panel	staging: panel: pass correct lengths to keypad_send_key()	2012-11-29 18:16:15 -08:00
phison
quickstart
ramster
rtl8187se	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
rtl8192e	staging: rtl8192e: Fix failure to check pci_map_single()	2013-01-07 12:57:27 -08:00
rtl8192u	staging/rtl8192u: do not init statics to 0	2013-01-07 12:53:41 -08:00
rtl8712	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
rts5139
sb105x	staging: Enable parport sb105x drivers if parport is configured	2013-01-07 09:32:46 -08:00
sbe-2t3e3
sep
serqt_usb2
silicom
slicoss
sm7xxfb
speakup	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
ste_rmi4
tidspbridge	staging: tidspbridge: use prepare/unprepare on dsp clocks	2013-01-07 15:03:56 -08:00
usbip	staging: Add angle bracket before and after the URL	2013-01-07 14:56:04 -08:00
vme	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
vt6655	staging: vt6655: Fix typo in vt6655 driver	2013-01-07 11:15:27 -08:00
vt6656	staging: vt6656: remove a useless call to memset().	2013-01-07 11:15:27 -08:00
winbond	staging: Add angle bracket before and after the URL	2013-01-07 14:56:04 -08:00
wlags49_h2	staging: wlags49_h2: remove unneeded memset() in wireless_get_bssid()	2013-01-07 11:08:12 -08:00
wlags49_h25
wlan-ng	Staging: wlan-ng: Add missing argument	2013-01-07 09:50:40 -08:00
xgifb
zcache
zram	staging: Add angle bracket before and after the URL	2013-01-07 14:56:04 -08:00
zsmalloc
Kconfig	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
Makefile	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
staging.c