git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sat, 8 Feb 2014 21:38:28 +0000 (13:38 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sat, 8 Feb 2014 21:38:28 +0000 (13:38 -0800)
commit	7ca363f6872bede71e486352885de3a88f4a3967
tree	75d334cd41bfdd5c9c6c49cb58c1301adfbe3903	tree \| snapshot
parent	e4b41af14d7dc683ecd84a10fed8ea38b94f0f28	commit \| diff
parent	a0f452520211385522aad5bd12d90aa59f17e094	commit \| diff

Merge branch 'staging-linus' into staging-work

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>

John Crispins staging tree

RSS Atom

drivers/staging/android/ion/ion_dummy_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/ion_heap.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/adv_pci1710.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/imx-hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/include/lustre/lustre_user.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/dir.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/os_dep/usb_intf.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/usbip/vhci_sysfs.c	diff1 \|	diff2 \|	blob \| history