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

Stephen Rothwell [Wed, 14 Dec 2011 05:03:18 +0000 (16:03 +1100)]

Merge remote-tracking branch 'char-misc/char-misc-next'

Stephen Rothwell [Wed, 14 Dec 2011 05:01:35 +0000 (16:01 +1100)]

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

Conflicts:
drivers/hid/hid-hyperv.c
drivers/staging/hv/Kconfig
drivers/staging/hv/Makefile
drivers/staging/iio/adc/ad799x_core.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:54:37 +0000 (15:54 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:52:40 +0000 (15:52 +1100)]

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

Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:45:29 +0000 (15:45 +1100)]

Merge commit 'refs/next/20111213/driver-core'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:31:51 +0000 (15:31 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:30:23 +0000 (15:30 +1100)]

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

Conflicts:
drivers/base/regmap/regcache.c
drivers/base/regmap/regmap.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:15:03 +0000 (15:15 +1100)]

Merge remote-tracking branch 'namespace/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:13:25 +0000 (15:13 +1100)]

Merge remote-tracking branch 'sysctl/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:07:19 +0000 (15:07 +1100)]

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

Conflicts:
arch/x86/xen/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:05:48 +0000 (15:05 +1100)]

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

Conflicts:
arch/x86/xen/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 04:04:03 +0000 (15:04 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:57:33 +0000 (14:57 +1100)]

Merge remote-tracking branch 'kmemleak/kmemleak'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:51:16 +0000 (14:51 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:44:18 +0000 (14:44 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:36:58 +0000 (14:36 +1100)]

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

Conflicts:
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/macintosh/rack-meter.c
fs/proc/stat.c
fs/proc/uptime.c
kernel/sched/core.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:34:24 +0000 (14:34 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:32:47 +0000 (14:32 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:29:10 +0000 (14:29 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:27:36 +0000 (14:27 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:20:44 +0000 (14:20 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:13:26 +0000 (14:13 +1100)]

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

Conflicts:
arch/powerpc/platforms/40x/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:13:16 +0000 (14:13 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:06:52 +0000 (14:06 +1100)]

Merge remote-tracking branch 'cputime/cputime'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:05:25 +0000 (14:05 +1100)]

Merge remote-tracking branch 'iommu/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:03:47 +0000 (14:03 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 03:01:03 +0000 (14:01 +1100)]

Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:59:35 +0000 (13:59 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:58:01 +0000 (13:58 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:53:09 +0000 (13:53 +1100)]

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

Conflicts:
drivers/gpu/drm/nouveau/nouveau_sgdma.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:48:53 +0000 (13:48 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:47:24 +0000 (13:47 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:45:55 +0000 (13:45 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:45:45 +0000 (13:45 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:44:19 +0000 (13:44 +1100)]

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

Conflicts:
drivers/mmc/card/block.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:41:01 +0000 (13:41 +1100)]

Merge remote-tracking branch 'battery/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:38:34 +0000 (13:38 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:36:56 +0000 (13:36 +1100)]

Merge remote-tracking branch 'input/next'

Conflicts:
drivers/input/keyboard/samsung-keypad.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:35:26 +0000 (13:35 +1100)]

Merge branch 'quilt/rr'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:34:00 +0000 (13:34 +1100)]

Merge remote-tracking branch 'cpufreq/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:32:20 +0000 (13:32 +1100)]

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

Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:30:45 +0000 (13:30 +1100)]

Merge remote-tracking branch 'crypto/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)]

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

Conflicts:
drivers/mtd/bcm63xxpart.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:27:47 +0000 (13:27 +1100)]

Merge remote-tracking branch 'mtd/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:25:57 +0000 (13:25 +1100)]

Merge remote-tracking branch 'wireless-next/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 02:02:10 +0000 (13:02 +1100)]

Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:22:40 +0000 (12:22 +1100)]

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

Conflicts:
drivers/dma/pl330.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:21:14 +0000 (12:21 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:19:42 +0000 (12:19 +1100)]

Merge remote-tracking branch 'target-merge/for-next-merge'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:17:56 +0000 (12:17 +1100)]

Merge remote-tracking branch 'scsi/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:16:25 +0000 (12:16 +1100)]

Merge remote-tracking branch 'dlm/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:14:59 +0000 (12:14 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:13:01 +0000 (12:13 +1100)]

Merge remote-tracking branch 'libata/NEXT'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:12:57 +0000 (12:12 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:11:29 +0000 (12:11 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:08:04 +0000 (12:08 +1100)]

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

Conflicts:
drivers/staging/media/as102/as102_drv.h

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:06:38 +0000 (12:06 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:05:14 +0000 (12:05 +1100)]

Merge branch 'quilt/jdelvare-hwmon'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:03:48 +0000 (12:03 +1100)]

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

Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 01:02:19 +0000 (12:02 +1100)]

Merge branch 'quilt/i2c'

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:54:53 +0000 (11:54 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:53:29 +0000 (11:53 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:52:00 +0000 (11:52 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:50:37 +0000 (11:50 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:49:11 +0000 (11:49 +1100)]

Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:47:36 +0000 (11:47 +1100)]

Merge remote-tracking branch 'gfs2/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:46:08 +0000 (11:46 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:44:44 +0000 (11:44 +1100)]

Merge remote-tracking branch 'ext4/dev'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:44:41 +0000 (11:44 +1100)]

Merge remote-tracking branch 'ecryptfs/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:43:13 +0000 (11:43 +1100)]

Merge remote-tracking branch 'xtensa/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:41:46 +0000 (11:41 +1100)]

Merge remote-tracking branch 's390/features'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:41:28 +0000 (11:41 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:39:04 +0000 (11:39 +1100)]

Merge remote-tracking branch '4xx/next'

Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:36:35 +0000 (11:36 +1100)]

Merge remote-tracking branch 'powerpc/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:35:10 +0000 (11:35 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:33:18 +0000 (11:33 +1100)]

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

Conflicts:
arch/mips/kernel/perf_event_mipsxx.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:31:49 +0000 (11:31 +1100)]

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

Conflicts:
arch/m68k/Kconfig.debug

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:30:27 +0000 (11:30 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:29:04 +0000 (11:29 +1100)]

Merge remote-tracking branch 'ia64/next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:27:43 +0000 (11:27 +1100)]

Merge branch 'quilt/hexagon'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:26:03 +0000 (11:26 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:20:40 +0000 (11:20 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:19:17 +0000 (11:19 +1100)]

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

Conflicts:
arch/arm/mach-tegra/board-dt.c
arch/arm/mach-tegra/include/mach/entry-macro.S

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:17:56 +0000 (11:17 +1100)]

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

Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-s3c64xx/mach-crag6410.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:16:28 +0000 (11:16 +1100)]

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

Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:14:01 +0000 (11:14 +1100)]

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

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-mxs/include/mach/common.h

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:08:06 +0000 (11:08 +1100)]

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

Conflicts:
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:06:41 +0000 (11:06 +1100)]

Merge remote-tracking branch 'devicetree-current/devicetree/merge'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:06:24 +0000 (11:06 +1100)]

Merge remote-tracking branch 'input-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:06:22 +0000 (11:06 +1100)]

Merge remote-tracking branch 'usb.current/usb-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:06:19 +0000 (11:06 +1100)]

Merge remote-tracking branch 'wireless/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:06:18 +0000 (11:06 +1100)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:06:18 +0000 (11:06 +1100)]

Merge remote-tracking branch 'sound-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:06:17 +0000 (11:06 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:06:16 +0000 (11:06 +1100)]

Merge remote-tracking branch 'scsi-rc-fixes/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 14 Dec 2011 00:06:15 +0000 (11:06 +1100)]

Merge remote-tracking branch 'sparc/master'

commit | commitdiff | tree

Linus Torvalds [Tue, 13 Dec 2011 23:02:31 +0000 (15:02 -0800)]

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "x86, efi: Calling __pa() with an ioremap()ed address is invalid"
x86, efi: Make efi_call_phys_{prelog,epilog} CONFIG_RELOCATABLE-aware

commit | commitdiff | tree

Olof Johansson [Tue, 13 Dec 2011 23:01:48 +0000 (15:01 -0800)]

Merge branch 'next/devel' into for-next

commit | commitdiff | tree

Olof Johansson [Tue, 13 Dec 2011 23:01:23 +0000 (15:01 -0800)]