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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 30 Apr 2012 03:43:27 +0000 (13:43 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 30 Apr 2012 03:43:27 +0000 (13:43 +1000)
commit	9b731601100a57586450908a43a27908587c2c77
tree	57d68658c4b90364129d58074ae5264e2c7320d2	tree \| snapshot
parent	d8037671a86a0e2b5cc01edbf2f7aaa57e06c782	commit \| diff
parent	59bf896406471ac49d124b3e5f4edcafe28e5360	commit \| diff

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
sound/soc/imx/Kconfig

20 files changed:

Documentation/DocBook/media/v4l/controls.xml	diff1 \|	diff2 \|	blob \| history
Documentation/hwmon/it87	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/lantiq/xway/gpio.c	diff1 \|	diff2 \|	blob \| history
arch/mips/lantiq/xway/gpio_stp.c	diff1 \|	diff2 \|	blob \| history
arch/mips/pci/pci-lantiq.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/docg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/ptp/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/regulator/tps65910-regulator.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_error.c	diff1 \|	diff2 \|	blob \| history
drivers/video/au1100fb.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

Documentation/DocBook/media/v4l/controls.xml	diff1 \|	diff2 \|	blob \| history
Documentation/hwmon/it87	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/lantiq/xway/gpio.c	diff1 \|	diff2 \|	blob \| history
arch/mips/lantiq/xway/gpio_stp.c	diff1 \|	diff2 \|	blob \| history
arch/mips/pci/pci-lantiq.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/docg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/ptp/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/regulator/tps65910-regulator.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_error.c	diff1 \|	diff2 \|	blob \| history
drivers/video/au1100fb.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history