1
0
Fork 0
alistair23-linux/drivers/staging
Linus Torvalds 3f17ea6dea Merge branch 'next' (accumulated 3.16 merge window patches) into master
Now that 3.15 is released, this merges the 'next' branch into 'master',
bringing us to the normal situation where my 'master' branch is the
merge window.

* accumulated work in next: (6809 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...
2014-06-08 11:31:16 -07:00
..
android Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next 2014-06-03 14:00:15 -07:00
bcm drivers/staging: Remove useless return variables 2014-05-26 10:32:15 -07:00
ced1401
comedi Merge branch 'next' (accumulated 3.16 merge window patches) into master 2014-06-08 11:31:16 -07:00
cptm1217
crystalhd
cxt1e1 staging: ctx1e1: remove checks for three macros 2014-05-26 20:19:26 -07:00
dgap Revert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()" 2014-05-29 13:59:03 -07:00
dgnc staging: dgnc: Use time_after_eq() 2014-05-25 11:53:44 -07:00
dgrp
et131x staging: et131x: Remove empty file Module.symvers 2014-05-23 20:43:47 +09:00
frontier Staging/frontier/tranzport: coding style fixes 2014-05-28 14:30:33 -07:00
ft1000 staging: ft1000: Remove useless return variables 2014-05-24 02:14:31 +09:00
fwserial
gdm72xx staging: gdm72xx: code cleanup 2014-05-24 07:23:15 +09:00
gdm724x
goldfish goldfish: clean up staging ifdefs 2014-05-15 13:20:41 -07:00
gs_fpgaboot staging: gs_fpgaboot: Fixed code style issues 2014-05-15 13:56:10 -07:00
iio Third round of new stuff for IIO in the 3.16 cycle. 2014-05-25 10:56:30 -07:00
imx-drm imx-hdmi: Make checkpatch happy 2014-05-23 20:44:43 +09:00
keucr staging: Convert __FUNCTION__ to __func__ 2014-05-25 11:05:07 -07:00
line6 staging/line6: blank line after declaration cleanup 2014-05-15 13:54:29 -07:00
lustre File locking related changes for v3.16 2014-06-04 08:12:50 -07:00
media Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media into next 2014-06-04 14:24:30 -07:00
mt29f_spinand staging/mt29f_spinand: coding style fixes 2014-06-01 16:46:57 -07:00
netlogic
nokia_h4p
nvec
octeon
octeon-usb staging: Convert __FUNCTION__ to __func__ 2014-05-25 11:05:07 -07:00
olpc_dcon staging/olpc_dcon: fix checkpatch warnings 2014-05-24 07:23:15 +09:00
ozwpan staging: ozwpan: Remove useless return variables 2014-05-23 21:11:57 +09:00
panel staging: panel: (coding style) Multiple assignments 2014-05-25 10:59:52 -07:00
phison
quickstart
rtl8188eu staging: rtl8188eu: Remove unneeded version.h inclusion 2014-05-28 14:30:32 -07:00
rtl8192e Merge branch 'next' (accumulated 3.16 merge window patches) into master 2014-06-08 11:31:16 -07:00
rtl8192ee rtl8192ee: btcoexist: remove undefined Kconfig macros 2014-05-28 14:33:03 -07:00
rtl8192u Staging: rtl8192u: r8192U_wx.c Fixed a misplaced brace 2014-05-29 13:43:23 -07:00
rtl8712 staging: rtl8712: return -ENOMEM instead of -1 2014-05-27 11:55:29 -07:00
rtl8723au staging: rtl8723au: Remove redundant casting in usb_ops_linux.c 2014-05-28 14:36:05 -07:00
rtl8821ae staging: rtl8821ae: stats.c: Remove version specific code 2014-05-27 11:58:27 -07:00
rts5208 staging: rts5208: Use pci_device_id rather than DEFINE_PCI_DEVICE_TABLE 2014-05-24 02:14:31 +09:00
sep drivers/staging: Remove useless return variables 2014-05-26 10:32:15 -07:00
serqt_usb2 staging: serqt_usb2: Clean up initializations of variables 2014-05-03 20:16:39 -04:00
silicom staging: silicom: fix sparse warning for static variable 2014-06-01 16:46:56 -07:00
skein staging: skein: fix sparse warning for static declarations 2014-06-01 16:58:59 -07:00
slicoss staging: slicoss: clean up use of dev_err 2014-05-25 10:59:53 -07:00
speakup Merge branch 'next' (accumulated 3.16 merge window patches) into master 2014-06-08 11:31:16 -07:00
ste_rmi4
tidspbridge staging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP 2014-05-26 20:19:26 -07:00
unisys Staging: unisys: visorchipset: Remove filexfer.c 2014-05-23 20:21:10 +09:00
usbip USB driver patches for 3.16-rc1 2014-06-03 09:11:20 -07:00
vme
vt6655 staging: vt6655: refactor iwctl_giwaplist() to avoid -Wframe-larger-than warn. 2014-05-28 14:10:46 -07:00
vt6656 staging: vt6656: rf.c replace DBG_PRT debug messages 2014-05-28 14:10:46 -07:00
winbond staging/winbond: fix a style error 2014-05-23 21:13:40 +09:00
wlags49_h2 staging: wlags49_h2: wl_priv: Remove useless return variables 2014-05-24 01:55:14 +09:00
wlags49_h25
wlan-ng drivers/staging: Remove useless return variables 2014-05-26 10:32:15 -07:00
xgifb Staging: xgifb: Fixed a code-style warning 2014-05-24 04:42:20 +09:00
xillybus staging: xillybus: Use devm_ API on probe and remove 2014-05-24 02:11:48 +09:00
Kconfig staging: remove rts5139 driver code 2014-05-23 20:46:41 +09:00
Makefile staging: remove rts5139 driver code 2014-05-23 20:46:41 +09:00
staging.c