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: f9844b1 ba6857b)

author	Mark Brown <broonie@linaro.org>
	Fri, 18 Oct 2013 18:43:18 +0000 (19:43 +0100)
committer	Mark Brown <broonie@linaro.org>
	Fri, 18 Oct 2013 18:43:18 +0000 (19:43 +0100)
commit	d29dcfcc8cd142f739f4a8893361181c265b7ace
tree	9a1827d4de8550f732af86909bccdb67b707555e	tree \| snapshot
parent	f9844b1acfe76420faeda6028f9a730e95d93180	commit \| diff
parent	ba6857b2d49646f2d4c245ff58d95d145f380177	commit \| diff

Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
include/linux/netdevice.h

arch/powerpc/kernel/vio.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/bus.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/mvsdio.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/atmel_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_sysfs.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules