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)]

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 [Wed, 5 Oct 2011 07:44:49 +0000 (18:44 +1100)]

Merge remote-tracking branch 'kvmtool/master'

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 07:36:37 +0000 (18:36 +1100)]

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

Conflicts:
arch/arm/mach-bcmring/mm.c
drivers/media/dvb/frontends/dibx000_common.c
drivers/mfd/twl6030-irq.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/ad7745.c
drivers/staging/iio/industrialio-ring.c
include/linux/dmaengine.h
sound/soc/soc-io.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 07:29:33 +0000 (18:29 +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 [Wed, 5 Oct 2011 07:28:08 +0000 (18:28 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 07:22:53 +0000 (18:22 +1100)]

Merge remote-tracking branch 'tmem/tmem'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 07:18:46 +0000 (18:18 +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/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
drivers/staging/zram/zram_drv.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 07:05:38 +0000 (18:05 +1100)]

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

Conflicts:
arch/arm/mach-omap2/Makefile

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 07:03:35 +0000 (18:03 +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 [Wed, 5 Oct 2011 06:56:54 +0000 (17:56 +1100)]

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

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 06:55:29 +0000 (17:55 +1100)]

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

Conflicts:
drivers/mfd/wm831x-spi.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 06:53:57 +0000 (17:53 +1100)]

Merge remote-tracking branch 'namespace/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 06:52:32 +0000 (17:52 +1100)]

Merge remote-tracking branch 'sysctl/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 06:51:01 +0000 (17:51 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 06:49:37 +0000 (17:49 +1100)]

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

Conflicts:
arch/x86/xen/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 06:43:54 +0000 (17:43 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 06:37:45 +0000 (17:37 +1100)]

Merge remote-tracking branch 'ptrace/ptrace'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 06:32:02 +0000 (17:32 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 06:25:24 +0000 (17:25 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 05:47:16 +0000 (16:47 +1100)]

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

Conflicts:
drivers/iommu/Makefile

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 05:45:50 +0000 (16:45 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 05:44:30 +0000 (16:44 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 05:23:38 +0000 (16:23 +1100)]

Merge commit 'refs/next/20111004/devicetree'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 05:14:54 +0000 (16:14 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 05:13:34 +0000 (16:13 +1100)]

Merge remote-tracking branch 'edac/linux_next'

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 05:10:36 +0000 (16:10 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 05:09:13 +0000 (16:09 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 05:02:42 +0000 (16:02 +1100)]

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

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 04:58:26 +0000 (15:58 +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 [Wed, 5 Oct 2011 04:41:37 +0000 (15:41 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 04:35:40 +0000 (15:35 +1100)]

Merge remote-tracking branch 'iommu/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 04:35:28 +0000 (15:35 +1100)]

Merge remote-tracking branch 'watchdog/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 04:34:47 +0000 (15:34 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 04:28:08 +0000 (15:28 +1100)]

Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 04:26:42 +0000 (15:26 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 04:25:21 +0000 (15:25 +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 [Wed, 5 Oct 2011 03:59:26 +0000 (14:59 +1100)]

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

Conflicts:
drivers/video/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:57:54 +0000 (14:57 +1100)]

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

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:56:27 +0000 (14:56 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:49:53 +0000 (14:49 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:49:44 +0000 (14:49 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:48:21 +0000 (14:48 +1100)]

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

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:48:10 +0000 (14:48 +1100)]

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

Conflicts:
drivers/leds/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:46:21 +0000 (14:46 +1100)]

Merge remote-tracking branch 'battery/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:44:45 +0000 (14:44 +1100)]

Merge branch 'quilt/device-mapper'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:42:34 +0000 (14:42 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:40:44 +0000 (14:40 +1100)]

Merge remote-tracking branch 'input/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:39:23 +0000 (14:39 +1100)]

Merge branch 'quilt/rr'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:38:04 +0000 (14:38 +1100)]

Merge remote-tracking branch 'cpufreq/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:36:42 +0000 (14:36 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:34:37 +0000 (14:34 +1100)]

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

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:28:55 +0000 (14:28 +1100)]

Merge remote-tracking branch 'crypto/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:27:34 +0000 (14:27 +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 [Wed, 5 Oct 2011 03:16:26 +0000 (14:16 +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 [Wed, 5 Oct 2011 03:13:03 +0000 (14:13 +1100)]

Merge remote-tracking branch 'wireless/master'

Conflicts:
Documentation/feature-removal-schedule.txt

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 03:06:13 +0000 (14:06 +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 [Wed, 5 Oct 2011 02:55:02 +0000 (13:55 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:52:53 +0000 (13:52 +1100)]

Merge remote-tracking branch 'scsi/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:52:49 +0000 (13:52 +1100)]

Merge remote-tracking branch 'ibft/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:52:43 +0000 (13:52 +1100)]

Merge remote-tracking branch 'swiotlb/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:51:25 +0000 (13:51 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:50:01 +0000 (13:50 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:48:43 +0000 (13:48 +1100)]

Merge remote-tracking branch 'libata/NEXT'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:48:38 +0000 (13:48 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:47:09 +0000 (13:47 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:45:21 +0000 (13:45 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:44:01 +0000 (13:44 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:42:46 +0000 (13:42 +1100)]

Merge branch 'quilt/kernel-doc'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:41:27 +0000 (13:41 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:40:15 +0000 (13:40 +1100)]

Merge branch 'quilt/jdelvare-hwmon'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:38:53 +0000 (13:38 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:37:41 +0000 (13:37 +1100)]

Merge branch 'quilt/i2c'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:36:21 +0000 (13:36 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:34:54 +0000 (13:34 +1100)]

Merge remote-tracking branch 'xfs/master'

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:33:40 +0000 (13:33 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:32:12 +0000 (13:32 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:26:06 +0000 (13:26 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:24:51 +0000 (13:24 +1100)]

Merge remote-tracking branch 'logfs/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:23:36 +0000 (13:23 +1100)]

Merge remote-tracking branch 'gfs2/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:22:11 +0000 (13:22 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:20:58 +0000 (13:20 +1100)]

Merge remote-tracking branch 'xtensa/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:19:46 +0000 (13:19 +1100)]

Merge remote-tracking branch 'unicore32/unicore32'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:18:33 +0000 (13:18 +1100)]

Merge remote-tracking branch 'tile/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:17:19 +0000 (13:17 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:16:06 +0000 (13:16 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:09:30 +0000 (13:09 +1100)]

Merge remote-tracking branch 's390/features'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:08:11 +0000 (13:08 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:01:42 +0000 (13:01 +1100)]

Merge remote-tracking branch 'powerpc/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 02:00:23 +0000 (13:00 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:59:04 +0000 (12:59 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:57:51 +0000 (12:57 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:56:38 +0000 (12:56 +1100)]

Merge remote-tracking branch 'ia64/test'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:55:19 +0000 (12:55 +1100)]

Merge branch 'quilt/hexagon'

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:54:00 +0000 (12:54 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:52:46 +0000 (12:52 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:49:24 +0000 (12:49 +1100)]

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

Conflicts:
drivers/gpio/Makefile

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:48:02 +0000 (12:48 +1100)]

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

Conflicts:
arch/arm/mach-imx/Makefile

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:46:44 +0000 (12:46 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:37:02 +0000 (12:37 +1100)]

Merge commit 'refs/next/20110930/arm-soc'

Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/plat-mxc/include/mach/gpio.h

commit | commitdiff | tree

Stephen Rothwell [Wed, 5 Oct 2011 01:12:17 +0000 (12:12 +1100)]

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c

Linux kernel for KaRo TX COM modules