]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 7 Jun 2013 04:25:23 +0000 (14:25 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/pgtable.h
Stephen Rothwell [Fri, 7 Jun 2013 04:17:08 +0000 (14:17 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 7 Jun 2013 04:15:10 +0000 (14:15 +1000)]
Merge remote-tracking branch 'spi-mb/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 04:06:45 +0000 (14:06 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/networking/netlink_mmap.txt
Stephen Rothwell [Fri, 7 Jun 2013 04:04:56 +0000 (14:04 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 7 Jun 2013 04:04:50 +0000 (14:04 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 7 Jun 2013 04:00:30 +0000 (14:00 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 7 Jun 2013 03:58:54 +0000 (13:58 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:58:51 +0000 (13:58 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:57:13 +0000 (13:57 +1000)]
Merge remote-tracking branch 'fbdev/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:55:38 +0000 (13:55 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 7 Jun 2013 03:54:01 +0000 (13:54 +1000)]
Merge remote-tracking branch 'mfd/master'
Conflicts:
drivers/mfd/intel_msic.c
Stephen Rothwell [Fri, 7 Jun 2013 03:36:24 +0000 (13:36 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:36:19 +0000 (13:36 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:34:39 +0000 (13:34 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:34:25 +0000 (13:34 +1000)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Fri, 7 Jun 2013 03:28:13 +0000 (13:28 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:23:45 +0000 (13:23 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:23:42 +0000 (13:23 +1000)]
Merge remote-tracking branch 'input-mt/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:22:05 +0000 (13:22 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 7 Jun 2013 03:20:27 +0000 (13:20 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:18:52 +0000 (13:18 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:17:14 +0000 (13:17 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:15:21 +0000 (13:15 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:13:46 +0000 (13:13 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:12:07 +0000 (13:12 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:04:11 +0000 (13:04 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Fri, 7 Jun 2013 03:02:36 +0000 (13:02 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 7 Jun 2013 03:01:01 +0000 (13:01 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 7 Jun 2013 02:58:41 +0000 (12:58 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
net/bluetooth/mgmt.c
Stephen Rothwell [Fri, 7 Jun 2013 02:56:30 +0000 (12:56 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/wireless/ath/ath9k/debug.c
net/mac80211/iface.c
Stephen Rothwell [Fri, 7 Jun 2013 02:46:30 +0000 (12:46 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Fri, 7 Jun 2013 02:38:47 +0000 (12:38 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 7 Jun 2013 02:37:11 +0000 (12:37 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 7 Jun 2013 02:34:59 +0000 (12:34 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:33:19 +0000 (12:33 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:31:04 +0000 (12:31 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 7 Jun 2013 02:30:59 +0000 (12:30 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c
Stephen Rothwell [Fri, 7 Jun 2013 02:29:20 +0000 (12:29 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Fri, 7 Jun 2013 02:21:10 +0000 (12:21 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:19:33 +0000 (12:19 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:17:50 +0000 (12:17 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:16:11 +0000 (12:16 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:14:11 +0000 (12:14 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 7 Jun 2013 02:12:37 +0000 (12:12 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:11:00 +0000 (12:11 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:09:23 +0000 (12:09 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:05:35 +0000 (12:05 +1000)]
Merge remote-tracking branch 'pci/next'
Conflicts:
drivers/acpi/pci_root.c
Stephen Rothwell [Fri, 7 Jun 2013 02:03:56 +0000 (12:03 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:02:19 +0000 (12:02 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 02:00:11 +0000 (12:00 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:58:34 +0000 (11:58 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:54:16 +0000 (11:54 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:52:21 +0000 (11:52 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 7 Jun 2013 01:50:46 +0000 (11:50 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:49:13 +0000 (11:49 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 7 Jun 2013 01:41:04 +0000 (11:41 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 7 Jun 2013 01:39:30 +0000 (11:39 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 7 Jun 2013 01:31:46 +0000 (11:31 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 7 Jun 2013 01:30:13 +0000 (11:30 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Fri, 7 Jun 2013 01:28:36 +0000 (11:28 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:27:02 +0000 (11:27 +1000)]
Merge remote-tracking branch 'ceph/testing'
Stephen Rothwell [Fri, 7 Jun 2013 01:25:28 +0000 (11:25 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Fri, 7 Jun 2013 01:23:51 +0000 (11:23 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
Stephen Rothwell [Fri, 7 Jun 2013 01:20:12 +0000 (11:20 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 7 Jun 2013 01:18:38 +0000 (11:18 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Fri, 7 Jun 2013 01:17:03 +0000 (11:17 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:15:29 +0000 (11:15 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:13:56 +0000 (11:13 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:12:24 +0000 (11:12 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Fri, 7 Jun 2013 01:10:51 +0000 (11:10 +1000)]
Merge remote-tracking branch 'cris/for-next'
Conflicts:
arch/cris/arch-v32/drivers/Kconfig
Stephen Rothwell [Fri, 7 Jun 2013 01:09:12 +0000 (11:09 +1000)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Fri, 7 Jun 2013 01:09:11 +0000 (11:09 +1000)]
Merge remote-tracking branch 'xilinx/arm-next'
Conflicts:
arch/arm/mach-highbank/highbank.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-spear/spear13xx.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/platsmp.c
drivers/clocksource/Makefile
drivers/clocksource/tegra20_timer.c
Stephen Rothwell [Fri, 7 Jun 2013 01:07:34 +0000 (11:07 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:06:02 +0000 (11:06 +1000)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:27 +0000 (11:00 +1000)]
Merge remote-tracking branch 'vfio-fixes/for-linus'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:24 +0000 (11:00 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Conflicts:
scripts/Makefile.lib
Stephen Rothwell [Fri, 7 Jun 2013 01:00:22 +0000 (11:00 +1000)]
Merge remote-tracking branch 'irqdomain-current/irqdomain/merge'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:18 +0000 (11:00 +1000)]
Merge remote-tracking branch 'ide/master'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:16 +0000 (11:00 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:11 +0000 (11:00 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:11 +0000 (11:00 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:10 +0000 (11:00 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:09 +0000 (11:00 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:08 +0000 (11:00 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:07 +0000 (11:00 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:06 +0000 (11:00 +1000)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:05 +0000 (11:00 +1000)]
Merge remote-tracking branch 'powerpc-merge/merge'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:04 +0000 (11:00 +1000)]
Merge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:04 +0000 (11:00 +1000)]
Merge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Fri, 7 Jun 2013 01:00:03 +0000 (11:00 +1000)]
Merge remote-tracking branch 'arc-current/for-curr'
Kees Cook [Thu, 6 Jun 2013 20:52:21 +0000 (13:52 -0700)]
charger-manager: Ensure event is not used as format string
The exposed interface for cm_notify_event() could result in the event msg
string being parsed as a format string. Make sure it is only used as a
literal string.
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Cc: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Jingoo Han [Mon, 3 Jun 2013 09:05:05 +0000 (18:05 +0900)]
power_supply: Replace strict_strtoul() with kstrtoul()
The usage of strict_strtoul() is not preferred, because strict_strtoul()
is obsolete. Thus, kstrtoul() should be used.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Axel Lin [Fri, 24 May 2013 17:41:44 +0000 (01:41 +0800)]
generic-adc-battery: Fix checking if none of the channels are supported
If none of the channels are supported, index is 0. Also ensure to return
error code instead of 0 in goto second_mem_fail path.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: anish kumar <anish198519851985@gmail.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Jingoo Han [Thu, 23 May 2013 10:34:39 +0000 (19:34 +0900)]
power: Use platform_{get,set}_drvdata()
Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Axel Lin [Thu, 16 May 2013 13:17:04 +0000 (21:17 +0800)]
pm2301_charger: Return error if create_singlethread_workqueue fails
Return error instead of 0 if create_singlethread_workqueue call fails.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Axel Lin [Thu, 16 May 2013 09:31:00 +0000 (17:31 +0800)]
pm2301_charger: Fix NULL pointer dereference
Add checking pl_data in probe, this prevent possible NULL pointer
dereference. Also fix NULL pointer deference in dev_err when allocate
memory for pm2 fails.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Kim, Milo [Fri, 10 May 2013 07:17:51 +0000 (07:17 +0000)]
lp8727_charger: Support the device tree feature
The interrupt and charging parameters are configurable in the device tree
structure. In the board test, a GPIO is used for handling LP8727
interrupts. The device tree binding documentation is added also.
Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Jingoo Han [Mon, 6 May 2013 04:24:33 +0000 (13:24 +0900)]
twl4030_charger: Remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on
probe failure, since commit
0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is
not needed to manually clear the device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Jingoo Han [Mon, 6 May 2013 04:23:45 +0000 (13:23 +0900)]
rx51_battery: Remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on
probe failure, since commit
0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is
not needed to manually clear the device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>