]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 13 Dec 2011 06:22:07 +0000 (17:22 +1100)]
Merge remote-tracking branch 'xshm/xshm-for-next'
Stephen Rothwell [Tue, 13 Dec 2011 06:18:56 +0000 (17:18 +1100)]
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'
Conflicts:
Documentation/feature-removal-schedule.txt
Stephen Rothwell [Tue, 13 Dec 2011 06:12:19 +0000 (17:12 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig
Stephen Rothwell [Tue, 13 Dec 2011 06:10:47 +0000 (17:10 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 06:04:26 +0000 (17:04 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Tue, 13 Dec 2011 06:02:31 +0000 (17:02 +1100)]
Merge remote-tracking branch 'tmem/tmem'
Conflicts:
mm/swapfile.c
Stephen Rothwell [Tue, 13 Dec 2011 06:00:51 +0000 (17:00 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:59:11 +0000 (16:59 +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
Stephen Rothwell [Tue, 13 Dec 2011 05:42:53 +0000 (16:42 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:40:53 +0000 (16:40 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
Stephen Rothwell [Tue, 13 Dec 2011 05:34:41 +0000 (16:34 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:33:07 +0000 (16:33 +1100)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:31:33 +0000 (16:31 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:29:53 +0000 (16:29 +1100)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Tue, 13 Dec 2011 05:28:16 +0000 (16:28 +1100)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Tue, 13 Dec 2011 05:22:03 +0000 (16:22 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Tue, 13 Dec 2011 05:20:32 +0000 (16:20 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Tue, 13 Dec 2011 05:18:50 +0000 (16:18 +1100)]
Merge remote-tracking branch 'oprofile/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:12:21 +0000 (16:12 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Tue, 13 Dec 2011 05:05:27 +0000 (16:05 +1100)]
Merge remote-tracking branch 'uprobes/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:58:32 +0000 (15:58 +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
Stephen Rothwell [Tue, 13 Dec 2011 04:56:00 +0000 (15:56 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Tue, 13 Dec 2011 04:54:27 +0000 (15:54 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:51:20 +0000 (15:51 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:49:45 +0000 (15:49 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:42:55 +0000 (15:42 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:35:59 +0000 (15:35 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/powerpc/platforms/40x/Kconfig
Stephen Rothwell [Tue, 13 Dec 2011 04:35:49 +0000 (15:35 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:29:27 +0000 (15:29 +1100)]
Merge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Tue, 13 Dec 2011 04:27:55 +0000 (15:27 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 13 Dec 2011 04:26:19 +0000 (15:26 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
lib/Makefile
Stephen Rothwell [Tue, 13 Dec 2011 04:22:02 +0000 (15:22 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:20:28 +0000 (15:20 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:15:40 +0000 (15:15 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Stephen Rothwell [Tue, 13 Dec 2011 04:11:27 +0000 (15:11 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:09:58 +0000 (15:09 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:08:24 +0000 (15:08 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:08:14 +0000 (15:08 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:06:42 +0000 (15:06 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:05:09 +0000 (15:05 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 13 Dec 2011 04:02:39 +0000 (15:02 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:01:03 +0000 (15:01 +1100)]
Merge remote-tracking branch 'input/next'
Conflicts:
drivers/input/keyboard/samsung-keypad.c
Stephen Rothwell [Tue, 13 Dec 2011 03:59:33 +0000 (14:59 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Tue, 13 Dec 2011 03:58:04 +0000 (14:58 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Tue, 13 Dec 2011 03:56:28 +0000 (14:56 +1100)]
Merge commit 'refs/next/
20111212/sound-asoc'
Stephen Rothwell [Tue, 13 Dec 2011 03:48:07 +0000 (14:48 +1100)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c
Stephen Rothwell [Tue, 13 Dec 2011 03:46:35 +0000 (14:46 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 13 Dec 2011 03:45:01 +0000 (14:45 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
drivers/mtd/bcm63xxpart.c
Stephen Rothwell [Tue, 13 Dec 2011 03:43:33 +0000 (14:43 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Tue, 13 Dec 2011 03:37:26 +0000 (14:37 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
Stephen Rothwell [Tue, 13 Dec 2011 03:33:44 +0000 (14:33 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/pl330.c
Stephen Rothwell [Tue, 13 Dec 2011 03:32:08 +0000 (14:32 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Tue, 13 Dec 2011 03:30:19 +0000 (14:30 +1100)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Tue, 13 Dec 2011 03:28:45 +0000 (14:28 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Tue, 13 Dec 2011 03:27:19 +0000 (14:27 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 03:25:17 +0000 (14:25 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 13 Dec 2011 03:25:14 +0000 (14:25 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 03:23:44 +0000 (14:23 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 03:20:20 +0000 (14:20 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/staging/media/as102/as102_drv.h
Stephen Rothwell [Tue, 13 Dec 2011 03:18:53 +0000 (14:18 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 13 Dec 2011 03:17:30 +0000 (14:17 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 13 Dec 2011 01:41:20 +0000 (12:41 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c
Stephen Rothwell [Tue, 13 Dec 2011 01:39:50 +0000 (12:39 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Tue, 13 Dec 2011 01:38:17 +0000 (12:38 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:32:16 +0000 (12:32 +1100)]
Merge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:30:48 +0000 (12:30 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:29:15 +0000 (12:29 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:27:52 +0000 (12:27 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:26:27 +0000 (12:26 +1100)]
Merge remote-tracking branch 'logfs/master'
Conflicts:
fs/logfs/file.c
Stephen Rothwell [Tue, 13 Dec 2011 01:24:50 +0000 (12:24 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 13 Dec 2011 01:23:25 +0000 (12:23 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:23:21 +0000 (12:23 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 13 Dec 2011 01:21:50 +0000 (12:21 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Tue, 13 Dec 2011 01:20:20 +0000 (12:20 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 13 Dec 2011 01:20:03 +0000 (12:20 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Tue, 13 Dec 2011 01:17:41 +0000 (12:17 +1100)]
Merge remote-tracking branch '4xx/next'
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Stephen Rothwell [Tue, 13 Dec 2011 01:15:16 +0000 (12:15 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 13 Dec 2011 01:13:51 +0000 (12:13 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:12:03 +0000 (12:12 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Conflicts:
arch/mips/kernel/perf_event_mipsxx.c
Stephen Rothwell [Tue, 13 Dec 2011 01:10:36 +0000 (12:10 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Conflicts:
arch/m68k/Kconfig.debug
Stephen Rothwell [Tue, 13 Dec 2011 01:09:14 +0000 (12:09 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:07:49 +0000 (12:07 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 13 Dec 2011 01:06:30 +0000 (12:06 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Tue, 13 Dec 2011 01:04:50 +0000 (12:04 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 00:59:26 +0000 (11:59 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 00:58:02 +0000 (11:58 +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
Stephen Rothwell [Tue, 13 Dec 2011 00:56:40 +0000 (11:56 +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
Stephen Rothwell [Tue, 13 Dec 2011 00:55:14 +0000 (11:55 +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
Stephen Rothwell [Tue, 13 Dec 2011 00:43:27 +0000 (11:43 +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
Stephen Rothwell [Tue, 13 Dec 2011 00:37:35 +0000 (11:37 +1100)]
Merge remote-tracking branch 'arm/for-next'
Conflicts:
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
Stephen Rothwell [Tue, 13 Dec 2011 00:31:03 +0000 (11:31 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:46 +0000 (11:30 +1100)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:44 +0000 (11:30 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:42 +0000 (11:30 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:41 +0000 (11:30 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:40 +0000 (11:30 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:39 +0000 (11:30 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:39 +0000 (11:30 +1100)]
Merge remote-tracking branch 'scsi-rc-fixes/master'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:38 +0000 (11:30 +1100)]
Merge remote-tracking branch 'sparc/master'
projects / karo-tx-linux.git / log