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: afc1b27 c610f7f)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 07:08:15 +0000 (17:08 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 07:08:15 +0000 (17:08 +1000)
commit	89b50ed9f0ed566d983a9897ab3efe42053e42b1
tree	c1aaa50b91f9480b74141301a797a55c984035fa	tree \| snapshot
parent	afc1b275310a34b713d568a650bd8d3d7250b9d9	commit \| diff
parent	c610f7f772aa06ae2bd8e5ace87cde4d90f70198	commit \| diff

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

Conflicts:
drivers/staging/media/mn88473/mn88473.c

15 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/dma/ste_dma40.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/serial2002.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/file.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/rw26.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/bcm2048/radio-bcm2048.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/davinci_vpfe/dm365_resizer.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/mn88472/mn88472.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/mn88473/mn88473.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/nvec/nvec_power.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/unisys/include/timskmod.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules