git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6ea160f aa3bee0)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 05:12:04 +0000 (16:12 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 05:12:04 +0000 (16:12 +1100)
commit	c42a82aa8c3881b1dd0d766a628a920e54df91ac
tree	360c7f0e2aa9baa20c15fd5238447c2960d72283	tree \| snapshot
parent	6ea160f3a553a411bfc86ac8ae9ba141542334aa	commit \| diff
parent	aa3bee0daa38570b174ef6b8a77261b4473d5614	commit \| diff

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/imx-drm/imx-drm-core.c

13 files changed:

Documentation/devicetree/bindings/i2c/trivial-devices.txt	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/usb/dwc2.txt	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/lloop.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/as102/as102_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/go7007/go7007-usb.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/lirc/lirc_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ozwpan/ozproto.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/os_dep/os_intfs.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/usbip/usbip_common.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc2/hcd.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules