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

author	Herbert Xu <herbert@gondor.apana.org.au>
	Fri, 3 Nov 2017 14:10:18 +0000 (22:10 +0800)
committer	Herbert Xu <herbert@gondor.apana.org.au>
	Fri, 3 Nov 2017 14:10:18 +0000 (22:10 +0800)
commit	ab387f0af24e661fc1c2f609664ec9ae6618e3f0
tree	6254d174314b1bcce11ce28f1aadf0df93e25d8e	tree \| snapshot
parent	e666d4e9ceec94c0a88c94b7db31d56474da43b3	commit \| diff
parent	9e66317d3c92ddaab330c125dfe9d06eee268aff	commit \| diff

Merge git://git./linux/kernel/git/torvalds/linux

Merge 4.14-rc3 in order to pick up the new timer_setup function.