]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Krzysztof Kozlowski [Wed, 14 May 2014 00:07:56 +0000 (10:07 +1000)]
rtc: s5m: add support for S2MPS14 RTC
Add support for S2MPS14 to the rtc-s5m driver. Differences in S2MPS14
(in comparison to S5M8767):
- Layout of registers;
- Lack of century support for time and alarms (7 registers used for
storing time/alarm);
- Two buffer control registers: WUDR and RUDR;
- No register for enabling writing time;
- RTC interrupts are reported in main PMIC I2C device;
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Krzysztof Kozlowski [Wed, 14 May 2014 00:07:56 +0000 (10:07 +1000)]
rtc: s5m: support different register layout
Prepare for adding support for S2MPS14 RTC device to the
rtc-s5m driver:
1. Add a map of registers used by the driver which differ between
the chipsets (S5M876X and S2MPS14).
2. Move code of checking for alarm pending to separate function.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Krzysztof Kozlowski [Wed, 14 May 2014 00:07:55 +0000 (10:07 +1000)]
rtc: s5m: use shorter time of register update
Set the time needed for updating alarm and time registers to 0.45 ms.
The default is 7.32 ms which is too long and leads to warnings when
setting alarm or time:
s5m-rtc: waiting for UDR update, reached max number of retries
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Krzysztof Kozlowski [Wed, 14 May 2014 00:07:55 +0000 (10:07 +1000)]
rtc: s5m: remove undocumented time init on first boot
Remove the code for initializing time if this is first boot.
The code for detecting first boot uses undocumented field RTC_TCON in
RTC_UDR_CON register. According to S5M8767's datasheet this field is
reserved. On S2MPS14 it is not documented at all. On device first boot
the registers will be initialized with reset value (2000-01-01 00:00:00).
The code might work on S5M8763 but still this does not look like a task
for RTC driver.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Krzysztof Kozlowski [Wed, 14 May 2014 00:07:55 +0000 (10:07 +1000)]
mfd/rtc: sec/s5m: rename SEC* symbols to S5M
Prepare for adding support for S2MPS14 RTC device to the rtc-s5m driver:
1. Rename SEC* symbols to S5M.
2. Add S5M prefix to some of defines which are different between S5M876X
and S2MPS14.
This is only a rename-like patch, new code is not added.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:55 +0000 (10:07 +1000)]
mm: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:54 +0000 (10:07 +1000)]
sysctl: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:54 +0000 (10:07 +1000)]
ipc: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:54 +0000 (10:07 +1000)]
key: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:54 +0000 (10:07 +1000)]
fs: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:53 +0000 (10:07 +1000)]
ntfs: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:53 +0000 (10:07 +1000)]
inotify: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:53 +0000 (10:07 +1000)]
nfs: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:53 +0000 (10:07 +1000)]
lockd: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:52 +0000 (10:07 +1000)]
fscache: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:52 +0000 (10:07 +1000)]
coda: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:52 +0000 (10:07 +1000)]
scsi: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:52 +0000 (10:07 +1000)]
parport: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:51 +0000 (10:07 +1000)]
random: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:51 +0000 (10:07 +1000)]
cdrom: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:51 +0000 (10:07 +1000)]
tile: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:51 +0000 (10:07 +1000)]
ia64: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Joe Perches [Wed, 14 May 2014 00:07:50 +0000 (10:07 +1000)]
arm: convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Wed, 14 May 2014 00:07:50 +0000 (10:07 +1000)]
lib/test_bpf.c: don't use gcc union shortcut
Older gcc's (mine is gcc-4.4.4) make a mess of this.
lib/test_bpf.c:74: error: unknown field 'insns' specified in initializer
lib/test_bpf.c:75: warning: missing braces around initializer
lib/test_bpf.c:75: warning: (near initialization for 'tests[0].<anonymous>.insns[0]')
lib/test_bpf.c:76: error: extra brace group at end of initializer
lib/test_bpf.c:76: error: (near initialization for 'tests[0].<anonymous>')
lib/test_bpf.c:76: warning: excess elements in union initializer
lib/test_bpf.c:76: warning: (near initialization for 'tests[0].<anonymous>')
lib/test_bpf.c:77: error: extra brace group at end of initializer
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Wed, 14 May 2014 00:07:50 +0000 (10:07 +1000)]
mm/page_io.c: work around gcc bug
gcc-4.4.4 (at least) screws up this initialization.
mm/page_io.c: In function '__swap_writepage':
mm/page_io.c:277: error: unknown field 'bvec' specified in initializer
mm/page_io.c:278: warning: excess elements in struct initializer
mm/page_io.c:278: warning: (near initialization for 'from')
Fixes
f990bbc9bfa3cbd2d ("bio_vec-backed iov_iter").
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Wed, 14 May 2014 00:07:50 +0000 (10:07 +1000)]
drivers/gpio/gpio-zevio.c: fix build
Unbreak i386 allmodconfig.
This is a hack - please fix properly ;)
Cc: Fabian Vogt <fabian@ritter-vogt.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Fri, 16 May 2014 06:27:24 +0000 (16:27 +1000)]
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
mm/memblock.c
mm/memcontrol.c
Stephen Rothwell [Fri, 16 May 2014 05:59:29 +0000 (15:59 +1000)]
Merge branch 'rd-docs/master'
Stephen Rothwell [Fri, 16 May 2014 05:57:58 +0000 (15:57 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Fri, 16 May 2014 05:56:39 +0000 (15:56 +1000)]
Merge remote-tracking branch 'aio/master'
Stephen Rothwell [Fri, 16 May 2014 05:55:05 +0000 (15:55 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Fri, 16 May 2014 05:53:49 +0000 (15:53 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Conflicts:
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
Stephen Rothwell [Fri, 16 May 2014 05:52:53 +0000 (15:52 +1000)]
Merge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Fri, 16 May 2014 05:43:18 +0000 (15:43 +1000)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/dcache.c
fs/namei.c
fs/namespace.c
Stephen Rothwell [Fri, 16 May 2014 05:42:16 +0000 (15:42 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Fri, 16 May 2014 05:41:20 +0000 (15:41 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Fri, 16 May 2014 05:39:47 +0000 (15:39 +1000)]
Merge remote-tracking branch 'gpio/for-next'
Conflicts:
Documentation/driver-model/devres.txt
Stephen Rothwell [Fri, 16 May 2014 05:38:29 +0000 (15:38 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Fri, 16 May 2014 05:38:17 +0000 (15:38 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Fri, 16 May 2014 05:32:09 +0000 (15:32 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 16 May 2014 05:31:09 +0000 (15:31 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Fri, 16 May 2014 05:21:08 +0000 (15:21 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/iio/adc/Kconfig
Stephen Rothwell [Fri, 16 May 2014 05:20:05 +0000 (15:20 +1000)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c
Stephen Rothwell [Fri, 16 May 2014 05:11:35 +0000 (15:11 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Fri, 16 May 2014 05:09:53 +0000 (15:09 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
arch/arm64/kernel/early_printk.c
Stephen Rothwell [Fri, 16 May 2014 04:50:35 +0000 (14:50 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 16 May 2014 04:49:28 +0000 (14:49 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:48:11 +0000 (14:48 +1000)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:46:48 +0000 (14:46 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:46:41 +0000 (14:46 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Fri, 16 May 2014 04:35:32 +0000 (14:35 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:24:24 +0000 (14:24 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:15:30 +0000 (14:15 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Fri, 16 May 2014 04:14:21 +0000 (14:14 +1000)]
Merge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Fri, 16 May 2014 04:13:18 +0000 (14:13 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 16 May 2014 04:02:08 +0000 (14:02 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 16 May 2014 03:59:35 +0000 (13:59 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:58:30 +0000 (13:58 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:47:13 +0000 (13:47 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/block/mtip32xx/mtip32xx.c
kernel/sched/idle.c
net/ipv4/tcp_output.c
Stephen Rothwell [Fri, 16 May 2014 03:46:00 +0000 (13:46 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:44:10 +0000 (13:44 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:42:26 +0000 (13:42 +1000)]
Merge remote-tracking branch 'audit/master'
Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c
Stephen Rothwell [Fri, 16 May 2014 03:40:39 +0000 (13:40 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
Stephen Rothwell [Fri, 16 May 2014 03:39:22 +0000 (13:39 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 16 May 2014 03:38:29 +0000 (13:38 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 16 May 2014 03:37:18 +0000 (13:37 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Fri, 16 May 2014 03:27:21 +0000 (13:27 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 16 May 2014 03:26:08 +0000 (13:26 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
drivers/regulator/tps65090-regulator.c
Stephen Rothwell [Fri, 16 May 2014 03:24:10 +0000 (13:24 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:22:51 +0000 (13:22 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Fri, 16 May 2014 03:21:45 +0000 (13:21 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:21:28 +0000 (13:21 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 16 May 2014 03:20:31 +0000 (13:20 +1000)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Fri, 16 May 2014 03:19:15 +0000 (13:19 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 16 May 2014 03:17:49 +0000 (13:17 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:14:55 +0000 (13:14 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:13:49 +0000 (13:13 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 16 May 2014 03:12:42 +0000 (13:12 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 16 May 2014 03:01:36 +0000 (13:01 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 16 May 2014 03:00:18 +0000 (13:00 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 16 May 2014 02:59:14 +0000 (12:59 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 16 May 2014 02:58:17 +0000 (12:58 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Fri, 16 May 2014 02:56:54 +0000 (12:56 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Fri, 16 May 2014 02:55:57 +0000 (12:55 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Fri, 16 May 2014 02:54:20 +0000 (12:54 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_gem_gtt.c
Stephen Rothwell [Fri, 16 May 2014 02:53:19 +0000 (12:53 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/crypto_user.c
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
drivers/crypto/caam/error.c
Stephen Rothwell [Fri, 16 May 2014 02:22:50 +0000 (12:22 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 16 May 2014 02:21:30 +0000 (12:21 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
drivers/bluetooth/btusb.c
Stephen Rothwell [Fri, 16 May 2014 02:20:15 +0000 (12:20 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 16 May 2014 02:18:48 +0000 (12:18 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Fri, 16 May 2014 02:08:12 +0000 (12:08 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
net/ipv6/xfrm6_output.c
Stephen Rothwell [Fri, 16 May 2014 01:34:32 +0000 (11:34 +1000)]
Merge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Fri, 16 May 2014 01:33:21 +0000 (11:33 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 16 May 2014 01:32:25 +0000 (11:32 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:31:29 +0000 (11:31 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 16 May 2014 01:29:35 +0000 (11:29 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/mips/loongson/lemote-2f/clock.c
Stephen Rothwell [Fri, 16 May 2014 01:28:26 +0000 (11:28 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:27:05 +0000 (11:27 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:25:20 +0000 (11:25 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 16 May 2014 01:24:27 +0000 (11:24 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'