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>
	Wed, 20 Feb 2013 03:28:05 +0000 (14:28 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 03:28:05 +0000 (14:28 +1100)
commit	5ee725df20ad555695e21a9fb4bb6cf6bc1ddf3a
tree	1f5f344e3844a1559b38aa5fb19a5c5585bb126f	tree \| snapshot
parent	1477e62b770fc1f081d25f181ef6ed894f458bf6	commit \| diff
parent	df63447f1a4402d7d9c6a9cd1c39a6d6766452d1	commit \| diff

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

Conflicts:
arch/mips/cavium-octeon/executive/cvmx-helper-util.c
arch/mips/include/asm/octeon/cvmx-helper-util.h

18 files changed:

Documentation/00-INDEX	diff1 \|	diff2 \|	blob \| history
arch/mips/cavium-octeon/executive/cvmx-helper-util.c	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/octeon/cvmx-helper-util.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/85xx/p1022_ds.c	diff1 \|	diff2 \|	blob \| history
arch/xtensa/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/soc_camera/mx2_camera.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_make_chunk.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8983.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8985.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

Documentation/00-INDEX	diff1 \|	diff2 \|	blob \| history
arch/mips/cavium-octeon/executive/cvmx-helper-util.c	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/octeon/cvmx-helper-util.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/85xx/p1022_ds.c	diff1 \|	diff2 \|	blob \| history
arch/xtensa/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/soc_camera/mx2_camera.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_make_chunk.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8983.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8985.c	diff1 \|	diff2 \|	blob \| history