kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-09-28 19:20:30 +00:00
Code Issues Releases Packages Activity

Merge branch 'staging-linus' into staging-work

Browse source 
This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2014-02-08 13:38:28 -08:00
commit 7ca363f687
42 changed files with 502 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/iio/accel/bma180.c
View file

2
drivers/iio/adc/max1363.c
View file

1
drivers/iio/imu/adis16400.h
View file

10
drivers/iio/imu/adis16400_core.c
View file

16
drivers/iio/light/tsl2563.c
View file

16
drivers/iio/magnetometer/ak8975.c
View file

8
drivers/iio/magnetometer/mag3110.c
View file

45
drivers/staging/android/ashmem.c
View file

26
drivers/staging/android/ion/compat_ion.c
View file

12
drivers/staging/android/ion/ion_dummy_driver.c
View file

2
drivers/staging/android/ion/ion_heap.c
View file

1
drivers/staging/android/ion/ion_priv.h
View file

6
drivers/staging/android/ion/ion_system_heap.c
View file

17
drivers/staging/android/sw_sync.h
View file

14
drivers/staging/android/sync.c
View file

2
drivers/staging/comedi/drivers.c
View file

17
drivers/staging/comedi/drivers/adv_pci1710.c
View file

6
drivers/staging/comedi/drivers/usbduxsigma.c
View file

330
drivers/staging/dgrp/dgrp_net_ops.c
View file

3
drivers/staging/gdm72xx/gdm_usb.c
View file

6
drivers/staging/iio/Documentation/iio_utils.h
View file

13
drivers/staging/iio/adc/ad799x_core.c
View file

6
drivers/staging/iio/adc/mxs-lradc.c
View file

2
drivers/staging/iio/impedance-analyzer/ad5933.c
View file

55
drivers/staging/imx-drm/imx-drm-core.c
View file

22
drivers/staging/imx-drm/imx-hdmi.c
View file

5
drivers/staging/lustre/TODO
View file

2
drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
View file

2
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
View file

5
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
View file

3
drivers/staging/lustre/lustre/include/lustre/lustre_user.h
View file

2
drivers/staging/lustre/lustre/llite/dir.c
View file

6
drivers/staging/lustre/lustre/mdc/mdc_request.c
View file

5
drivers/staging/netlogic/xlr_net.c
View file

351
drivers/staging/octeon-usb/octeon-hcd.c
View file

22
drivers/staging/rtl8188eu/core/rtw_wlan_util.c
View file

12
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
View file

2
drivers/staging/rtl8188eu/os_dep/usb_intf.c
View file

2
drivers/staging/rtl8821ae/wifi.h
View file

10
drivers/staging/usbip/userspace/libsrc/names.c
View file

3
drivers/staging/usbip/vhci_sysfs.c
View file

2
drivers/staging/wlags49_h2/wl_wext.c
View file