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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c9d8987 98ecc66)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 07:22:55 +0000 (17:22 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 07:22:55 +0000 (17:22 +1000)
commit	c1cddd23fa932cb714fd341cc8f66ad5e478cf73
tree	5d051cdfacfcbccb7652e040c3ea941877cb67b1	tree \| snapshot
parent	c9d8987d610f3848f2baabce0396200c6ffca937	commit \| diff
parent	98ecc663f3f9e7353eeb5da5cad7116e2f075c77	commit \| diff

Merge remote-tracking branch 'kdbus/kdbus'

Conflicts:
Documentation/Makefile

Documentation/Makefile	diff1 \|	diff2 \|	blob \| history
Documentation/ioctl/ioctl-number.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/magic.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/Makefile	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules