]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 12 Dec 2011 04:00:16 +0000 (15:00 +1100)]
Merge remote-tracking branch 'xshm/xshm-for-next'
Stephen Rothwell [Mon, 12 Dec 2011 03:57:07 +0000 (14:57 +1100)]
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'
Conflicts:
Documentation/feature-removal-schedule.txt
Stephen Rothwell [Mon, 12 Dec 2011 03:50:28 +0000 (14:50 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig
Stephen Rothwell [Mon, 12 Dec 2011 03:48:59 +0000 (14:48 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 03:42:37 +0000 (14:42 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Mon, 12 Dec 2011 03:40:40 +0000 (14:40 +1100)]
Merge remote-tracking branch 'tmem/tmem'
Conflicts:
mm/swapfile.c
Stephen Rothwell [Mon, 12 Dec 2011 03:39:02 +0000 (14:39 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 12 Dec 2011 03:37:25 +0000 (14:37 +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 [Mon, 12 Dec 2011 03:26:07 +0000 (14:26 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 12 Dec 2011 03:24:12 +0000 (14:24 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
Stephen Rothwell [Mon, 12 Dec 2011 03:18:01 +0000 (14:18 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 12 Dec 2011 03:16:29 +0000 (14:16 +1100)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 03:15:00 +0000 (14:15 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 03:13:19 +0000 (14:13 +1100)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Mon, 12 Dec 2011 03:11:43 +0000 (14:11 +1100)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Mon, 12 Dec 2011 03:05:37 +0000 (14:05 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Mon, 12 Dec 2011 03:04:07 +0000 (14:04 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Mon, 12 Dec 2011 03:02:27 +0000 (14:02 +1100)]
Merge remote-tracking branch 'oprofile/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:55:58 +0000 (13:55 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Mon, 12 Dec 2011 02:49:05 +0000 (13:49 +1100)]
Merge remote-tracking branch 'uprobes/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:42:10 +0000 (13:42 +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 [Mon, 12 Dec 2011 02:40:37 +0000 (13:40 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:37:31 +0000 (13:37 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:35:58 +0000 (13:35 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:29:08 +0000 (13:29 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:25:27 +0000 (13:25 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/powerpc/platforms/40x/Kconfig
net/mac80211/work.c
Stephen Rothwell [Mon, 12 Dec 2011 02:25:18 +0000 (13:25 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:18:57 +0000 (13:18 +1100)]
Merge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Mon, 12 Dec 2011 02:17:30 +0000 (13:17 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 12 Dec 2011 02:15:54 +0000 (13:15 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:13:09 +0000 (13:13 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
lib/Makefile
Stephen Rothwell [Mon, 12 Dec 2011 02:11:40 +0000 (13:11 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:10:08 +0000 (13:10 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Mon, 12 Dec 2011 02:05:19 +0000 (13:05 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Stephen Rothwell [Mon, 12 Dec 2011 01:22:04 +0000 (12:22 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 01:20:32 +0000 (12:20 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 01:20:22 +0000 (12:20 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 12 Dec 2011 01:18:53 +0000 (12:18 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 12 Dec 2011 01:17:22 +0000 (12:17 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 12 Dec 2011 01:14:53 +0000 (12:14 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 01:13:16 +0000 (12:13 +1100)]
Merge remote-tracking branch 'input/next'
Conflicts:
drivers/input/keyboard/samsung-keypad.c
Stephen Rothwell [Mon, 12 Dec 2011 01:11:46 +0000 (12:11 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Mon, 12 Dec 2011 01:10:20 +0000 (12:10 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Mon, 12 Dec 2011 01:08:51 +0000 (12:08 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 01:07:15 +0000 (12:07 +1100)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c
Stephen Rothwell [Mon, 12 Dec 2011 01:05:43 +0000 (12:05 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 12 Dec 2011 01:04:15 +0000 (12:04 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
drivers/mtd/bcm63xxpart.c
Stephen Rothwell [Mon, 12 Dec 2011 01:02:48 +0000 (12:02 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Mon, 12 Dec 2011 01:01:00 +0000 (12:01 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 12 Dec 2011 00:55:01 +0000 (11:55 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
Stephen Rothwell [Mon, 12 Dec 2011 00:51:21 +0000 (11:51 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/pl330.c
Stephen Rothwell [Mon, 12 Dec 2011 00:49:53 +0000 (11:49 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Mon, 12 Dec 2011 00:48:18 +0000 (11:48 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:46:52 +0000 (11:46 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:44:52 +0000 (11:44 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 12 Dec 2011 00:44:48 +0000 (11:44 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:43:19 +0000 (11:43 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:39:56 +0000 (11:39 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/staging/media/as102/as102_drv.h
Stephen Rothwell [Mon, 12 Dec 2011 00:38:32 +0000 (11:38 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:37:06 +0000 (11:37 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 12 Dec 2011 00:35:43 +0000 (11:35 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c
Stephen Rothwell [Mon, 12 Dec 2011 00:34:14 +0000 (11:34 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Mon, 12 Dec 2011 00:32:44 +0000 (11:32 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:26:42 +0000 (11:26 +1100)]
Merge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:25:19 +0000 (11:25 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:23:48 +0000 (11:23 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:22:27 +0000 (11:22 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:21:01 +0000 (11:21 +1100)]
Merge remote-tracking branch 'logfs/master'
Conflicts:
fs/logfs/file.c
Stephen Rothwell [Mon, 12 Dec 2011 00:19:24 +0000 (11:19 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 12 Dec 2011 00:18:02 +0000 (11:18 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:17:57 +0000 (11:17 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:16:30 +0000 (11:16 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Mon, 12 Dec 2011 00:15:04 +0000 (11:15 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 12 Dec 2011 00:14:47 +0000 (11:14 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:12:23 +0000 (11:12 +1100)]
Merge remote-tracking branch '4xx/next'
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Stephen Rothwell [Mon, 12 Dec 2011 00:10:00 +0000 (11:10 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:08:33 +0000 (11:08 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:06:44 +0000 (11:06 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Conflicts:
arch/mips/kernel/perf_event_mipsxx.c
Stephen Rothwell [Mon, 12 Dec 2011 00:05:19 +0000 (11:05 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Conflicts:
arch/m68k/Kconfig.debug
Stephen Rothwell [Mon, 12 Dec 2011 00:03:55 +0000 (11:03 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:02:32 +0000 (11:02 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:01:08 +0000 (11:01 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Sun, 11 Dec 2011 23:59:29 +0000 (10:59 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Sun, 11 Dec 2011 23:54:05 +0000 (10:54 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Sun, 11 Dec 2011 23:52:44 +0000 (10:52 +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 [Sun, 11 Dec 2011 23:51:23 +0000 (10:51 +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 [Sun, 11 Dec 2011 23:49:58 +0000 (10:49 +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 [Sun, 11 Dec 2011 23:49:00 +0000 (10:49 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Sun, 11 Dec 2011 23:47:40 +0000 (10:47 +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-at91/setup.c
arch/arm/mach-mxs/include/mach/common.h
Stephen Rothwell [Sun, 11 Dec 2011 23:41:48 +0000 (10:41 +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 [Sun, 11 Dec 2011 23:40:11 +0000 (10:40 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Sun, 11 Dec 2011 23:40:10 +0000 (10:40 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Sun, 11 Dec 2011 23:40:09 +0000 (10:40 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 11 Dec 2011 23:40:08 +0000 (10:40 +1100)]
Merge remote-tracking branch 'sparc/master'
Stephen Rothwell [Sun, 11 Dec 2011 23:40:06 +0000 (10:40 +1100)]
Merge remote-tracking branch 'arm-current/fixes'
Jim Cromie [Tue, 6 Dec 2011 19:11:31 +0000 (12:11 -0700)]
kernel/params: replace DEBUGP with pr_debug
Use more flexible pr_debug. This allows:
echo "module params +p" > /dbg/dynamic_debug/control
to turn on debug messages when needed.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Jim Cromie [Tue, 6 Dec 2011 19:11:31 +0000 (12:11 -0700)]
module: replace DEBUGP with pr_debug
Use more flexible pr_debug. This allows:
echo "module module +p" > /dbg/dynamic_debug/control
to turn on debug messages when needed.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Sun, 11 Dec 2011 22:48:48 +0000 (09:48 +1100)]
lguest: move the lguest tool to the tools directory (fixes)
Fixup complilation breakage from move.
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Davidlohr Bueso [Fri, 2 Dec 2011 21:52:39 +0000 (22:52 +0100)]
lguest: move the lguest tool to the tools directory
This is a better location instead of having it in Documentation.
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Jean Delvare [Sun, 11 Dec 2011 22:48:41 +0000 (09:48 +1100)]
hwmon: (coretemp) Add missing section annotations
Many functions in the coretemp driver lack a proper section
annotation. Add them to let the kernel free the memory after
initialization when possible.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Durgadoss R <durgadoss.r@intel.com>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
projects / karo-tx-linux.git / log