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

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

projects / karo-tx-linux.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Andrew Morton [Wed, 5 Oct 2011 00:42:20 +0000 (11:42 +1100)]

drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug

The `#define filename' screws up the expansion of
DEFINE_DYNAMIC_DEBUG_METADATA:

drivers/net/ethernet/i825xx/3c505.c: In function 'send_pcb':
drivers/net/ethernet/i825xx/3c505.c:390: error: expected identifier before string constant
drivers/net/ethernet/i825xx/3c505.c:390: error: expected '}' before '.' token
drivers/net/ethernet/i825xx/3c505.c:436: error: expected identifier before string constant
drivers/net/ethernet/i825xx/3c505.c:435: error: expected '}' before '.' token
drivers/net/ethernet/i825xx/3c505.c: In function 'start_receive':
drivers/net/ethernet/i825xx/3c505.c:557: error: expected identifier before string constant
drivers/net/ethernet/i825xx/3c505.c:557: error: expected '}' before '.' token
drivers/net/ethernet/i825xx/3c505.c: In function 'receive_packet':
drivers/net/ethernet/i825xx/3c505.c:629: error: expected identifier before string constant

etc

Cc: Philip Blundell <philb@gnu.org>
Cc: David Miller <davem@davemloft.net>
Cc: Jason Baron <jbaron@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit | commitdiff | tree

Andrew Morton [Wed, 5 Oct 2011 00:42:20 +0000 (11:42 +1100)]

include/linux/dmar.h: forward-declare struct acpi_dmar_header

x86_64 allnoconfig:

In file included from arch/x86/kernel/pci-dma.c:3:
include/linux/dmar.h:248: warning: 'struct acpi_dmar_header' declared inside parameter list
include/linux/dmar.h:248: warning: its scope is only this definition or declaration, which is probably not what you want

Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 05:43:20 +0000 (16:43 +1100)]

Merge remote-tracking branch 'kvmtool/master'

Conflicts:
include/net/9p/9p.h

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 05:35:06 +0000 (16:35 +1100)]

Merge remote-tracking branch 'moduleh/for-sfr'

Conflicts:
arch/arm/mach-bcmring/mm.c
drivers/media/dvb/frontends/dibx000_common.c
drivers/misc/altera-stapl/altera.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
drivers/scsi/libfc/fc_lport.c
drivers/staging/iio/adc/ad7152.c
drivers/staging/iio/adc/ad7291.c
drivers/staging/iio/adc/ad7314.c
drivers/staging/iio/adc/ad7745.c
drivers/staging/iio/industrialio-ring.c
drivers/staging/iio/resolver/ad2s120x.c
include/linux/dmaengine.h
kernel/power/hibernate.c
sound/soc/soc-io.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 05:21:22 +0000 (16:21 +1100)]

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

Conflicts:
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/core.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 05:19:57 +0000 (16:19 +1100)]

Merge remote-tracking branch 'hwspinlock/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 05:13:47 +0000 (16:13 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 05:08:34 +0000 (16:08 +1100)]

Merge remote-tracking branch 'tmem/tmem'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 05:04:26 +0000 (16:04 +1100)]

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/misc/altera-stapl/altera.c
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/et131x/et1310_tx.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
drivers/staging/zram/zram_drv.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:41:55 +0000 (15:41 +1100)]

Merge remote-tracking branch 'usb/usb-next'

Conflicts:
arch/arm/mach-omap2/Makefile

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:39:52 +0000 (15:39 +1100)]

Merge remote-tracking branch 'tty/tty-next'

Conflicts:
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
drivers/tty/serial/8250.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:33:11 +0000 (15:33 +1100)]

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

Conflicts:
arch/arm/plat-mxc/devices.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:31:45 +0000 (15:31 +1100)]

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

Conflicts:
drivers/mfd/wm831x-spi.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:30:15 +0000 (15:30 +1100)]

Merge remote-tracking branch 'namespace/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:28:51 +0000 (15:28 +1100)]

Merge remote-tracking branch 'sysctl/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:27:19 +0000 (15:27 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:25:53 +0000 (15:25 +1100)]

Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
arch/x86/xen/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:20:10 +0000 (15:20 +1100)]

Merge remote-tracking branch 'xen/upstream/xen'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:13:59 +0000 (15:13 +1100)]

Merge remote-tracking branch 'ptrace/ptrace'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:08:17 +0000 (15:08 +1100)]

Merge remote-tracking branch 'kvm/kvm-updates/3.2'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 04:01:53 +0000 (15:01 +1100)]

Merge remote-tracking branch 'kmemleak/kmemleak'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:55:09 +0000 (14:55 +1100)]

Merge remote-tracking branch 'rcu/rcu/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:48:29 +0000 (14:48 +1100)]

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/iommu/Makefile

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:45:36 +0000 (14:45 +1100)]

Merge commit 'refs/next/20111005/gpio'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:39:28 +0000 (14:39 +1100)]

Merge remote-tracking branch 'spi/spi/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:37:00 +0000 (14:37 +1100)]

Merge remote-tracking branch 'devicetree/devicetree/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:35:39 +0000 (14:35 +1100)]

Merge remote-tracking branch 'edac-amd/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:34:20 +0000 (14:34 +1100)]

Merge remote-tracking branch 'edac/linux_next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:31:23 +0000 (14:31 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:29:58 +0000 (14:29 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:23:28 +0000 (14:23 +1100)]

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:19:11 +0000 (14:19 +1100)]

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

Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:15:21 +0000 (14:15 +1100)]

Merge remote-tracking branch 'osd/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:09:23 +0000 (14:09 +1100)]

Merge remote-tracking branch 'iommu/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:09:11 +0000 (14:09 +1100)]

Merge remote-tracking branch 'watchdog/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:08:31 +0000 (14:08 +1100)]

Merge remote-tracking branch 'agp/agp-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:01:49 +0000 (14:01 +1100)]

Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 03:00:23 +0000 (14:00 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:59:02 +0000 (13:59 +1100)]

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

Conflicts:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-rx51.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:49:49 +0000 (13:49 +1100)]

Merge remote-tracking branch 'fbdev/fbdev-next'

Conflicts:
drivers/video/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:48:19 +0000 (13:48 +1100)]

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

Conflicts:
arch/arm/mach-u300/include/mach/irqs.h

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:46:52 +0000 (13:46 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:40:16 +0000 (13:40 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:40:06 +0000 (13:40 +1100)]

Merge remote-tracking branch 'kgdb/kgdb-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:38:44 +0000 (13:38 +1100)]

Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:38:33 +0000 (13:38 +1100)]

Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:36:45 +0000 (13:36 +1100)]

Merge remote-tracking branch 'battery/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:35:09 +0000 (13:35 +1100)]

Merge branch 'quilt/device-mapper'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:32:58 +0000 (13:32 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:31:08 +0000 (13:31 +1100)]

Merge remote-tracking branch 'input/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:29:47 +0000 (13:29 +1100)]

Merge branch 'quilt/rr'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:28:28 +0000 (13:28 +1100)]

Merge remote-tracking branch 'cpufreq/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:21:53 +0000 (13:21 +1100)]

Merge commit 'refs/next/20111005/sound-asoc'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:15:03 +0000 (13:15 +1100)]

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

Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:09:23 +0000 (13:09 +1100)]

Merge remote-tracking branch 'crypto/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:08:01 +0000 (13:08 +1100)]

Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 02:07:25 +0000 (13:07 +1100)]

Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:58:39 +0000 (12:58 +1100)]

Merge remote-tracking branch 'wireless/master'

Conflicts:
Documentation/feature-removal-schedule.txt

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:51:49 +0000 (12:51 +1100)]

Merge remote-tracking branch 'net/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
net/batman-adv/soft-interface.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:25:10 +0000 (12:25 +1100)]

Merge remote-tracking branch 'slave-dma/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:23:00 +0000 (12:23 +1100)]

Merge remote-tracking branch 'scsi/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:22:56 +0000 (12:22 +1100)]

Merge remote-tracking branch 'ibft/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:22:50 +0000 (12:22 +1100)]

Merge remote-tracking branch 'swiotlb/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:21:32 +0000 (12:21 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:20:07 +0000 (12:20 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:18:48 +0000 (12:18 +1100)]

Merge remote-tracking branch 'libata/NEXT'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:18:43 +0000 (12:18 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:17:16 +0000 (12:17 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:15:30 +0000 (12:15 +1100)]

Merge remote-tracking branch 'v4l-dvb/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:14:11 +0000 (12:14 +1100)]

Merge remote-tracking branch 'docs/docs-move'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:12:58 +0000 (12:12 +1100)]

Merge branch 'quilt/kernel-doc'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:11:39 +0000 (12:11 +1100)]

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:10:27 +0000 (12:10 +1100)]

Merge branch 'quilt/jdelvare-hwmon'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:09:07 +0000 (12:09 +1100)]

Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:07:53 +0000 (12:07 +1100)]

Merge branch 'quilt/i2c'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:06:29 +0000 (12:06 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:05:08 +0000 (12:05 +1100)]

Merge remote-tracking branch 'xfs/master'

Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 01:00:03 +0000 (12:00 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:58:37 +0000 (11:58 +1100)]

Merge remote-tracking branch 'ocfs2/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:52:33 +0000 (11:52 +1100)]

Merge remote-tracking branch 'nfsd/nfsd-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:51:18 +0000 (11:51 +1100)]

Merge remote-tracking branch 'logfs/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:50:02 +0000 (11:50 +1100)]

Merge remote-tracking branch 'gfs2/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:48:36 +0000 (11:48 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:47:24 +0000 (11:47 +1100)]

Merge remote-tracking branch 'xtensa/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:46:10 +0000 (11:46 +1100)]

Merge remote-tracking branch 'unicore32/unicore32'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:44:57 +0000 (11:44 +1100)]

Merge remote-tracking branch 'tile/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:43:43 +0000 (11:43 +1100)]

Merge remote-tracking branch 'rmobile/rmobile-latest'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:42:31 +0000 (11:42 +1100)]

Merge remote-tracking branch 'sh/sh-latest'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:36:04 +0000 (11:36 +1100)]

Merge remote-tracking branch 's390/features'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:34:46 +0000 (11:34 +1100)]

Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:28:19 +0000 (11:28 +1100)]

Merge remote-tracking branch 'powerpc/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:26:58 +0000 (11:26 +1100)]

Merge remote-tracking branch 'mips/mips-for-linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:25:40 +0000 (11:25 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:24:28 +0000 (11:24 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:23:16 +0000 (11:23 +1100)]

Merge remote-tracking branch 'ia64/test'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:21:59 +0000 (11:21 +1100)]

Merge branch 'quilt/hexagon'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:20:41 +0000 (11:20 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:19:29 +0000 (11:19 +1100)]

Merge remote-tracking branch 'blackfin/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:16:07 +0000 (11:16 +1100)]

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

Conflicts:
drivers/gpio/Makefile

commit | commitdiff | tree

Stephen Rothwell [Thu, 6 Oct 2011 00:14:44 +0000 (11:14 +1100)]

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile

Linux kernel for KaRo TX COM modules