Add linux-next specific files for 20131024

Signed-off-by: Thierry Reding <treding@nvidia.com>

ARM: nommu: Implement dummy early_paging_init()

No-MMU configurations currenty fail to build because they are missing
the early_paging_init() symbol.

Signed-off-by: Thierry Reding <treding@nvidia.com>

ARM: Use arch_virt_to_idmap() only when available

The arch_virt_to_idmap variable is only available when patching of the
physical to virtual translations at runtime is enabled via the Kconfig
ARM_PATCH_PHYS_VIRT option.

Signed-off-by: Thierry Reding <treding@nvidia.com>

mmc: sdhci: dove: Fix build breakage

Commit 2d7c51f (mmc: sdhci: Use work structs instead of tasklets)
converts tasklets to work structs, but typos the conversion in the Dove
driver.

Signed-off-by: Thierry Reding <treding@nvidia.com>

ARM: davinci: Avoid name collisions

Signed-off-by: Thierry Reding <treding@nvidia.com>

tracing/events: Fix swiotlb tracepoint creation

Tracepoints are only created when Xen support is enabled, but they are
also referenced within lib/swiotlb.c. So unless Xen support is enabled
the tracepoints will be missing, therefore causing builds to fail. Fix
this by moving the tracepoint creation to lib/swiotlb.c, which works
nicely because the Xen swiotlb support selects the generic swiotlb
support.

Signed-off-by: Thierry Reding <treding@nvidia.com>

gpio: Fix build breakage

Signed-off-by: Thierry Reding <treding@nvidia.com>

PowerCap: Convert class code to use dev_groups

The newly added power capping framework uses the obsolete .dev_attrs
field of struct class. However this field will be removed in 3.13, so
convert the code to use the .dev_groups field instead.

Signed-off-by: Thierry Reding <treding@nvidia.com>

sched/wait: Fix build breakage

The wait_event_interruptible_lock_irq() macro is missing a semi-colon
which causes a build failure in the i915 DRM driver.

Signed-off-by: Thierry Reding <treding@nvidia.com>

misc: mic: Update for sysfs_get_dirent() cleanups

Signed-off-by: Mark Brown <broonie@linaro.org>

drm/i915: Resolve interaction with drm-fixes tree

Signed-off-by: Mark Brown <broonie@linaro.org>

ceph: Fix up for iov_iter changes

Extend an earlier fixup by Stephen Rothwell.

Signed-off-by: Mark Brown <broonie@linaro.org>

Merge remote-tracking branch 'lzo-update/lzo-update'

Merge remote-tracking branch 'random/dev'

Conflicts:
drivers/char/random.c

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

Conflicts:
drivers/clk/Makefile

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

Conflicts:
fs/fuse/dir.c

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

Conflicts:
arch/arm/mach-omap2/board-zoom-peripherals.c

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

Conflicts:
MAINTAINERS

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

Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c

Merge remote-tracking branch 'renesas/next'

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

Conflicts:
arch/arm/mach-kirkwood/board-dt.c

Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/mach-imx/mach-imx6q.c

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

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

Conflicts:
MAINTAINERS
arch/arm/boot/dts/omap3-evm.dts
arch/arm/mach-tegra/Kconfig
arch/arm/mach-ux500/board-mop500.c

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

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

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

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

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

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

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

Conflicts:
drivers/usb/musb/davinci.c

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

Conflicts:
drivers/Kconfig

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

Conflicts:
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c

Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
include/linux/netdevice.h

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

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

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

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

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

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

Conflicts:
arch/arm/kvm/reset.c

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

Conflicts:
arch/arm/kvm/reset.c

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

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

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

Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak

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

Conflicts:
drivers/spi/spi.c

Merge remote-tracking branch 'dt-rh/for-next'

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

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

Conflicts:
net/netfilter/xt_set.c

Merge remote-tracking branch 'iommu/next'

Merge remote-tracking branch 'security/next'

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

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

Merge remote-tracking branch 'battery/master'

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

Conflicts:
sound/soc/codecs/mc13783.c

Merge remote-tracking branch 'mfd/master'

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

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

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

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

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

Conflicts:
mm/memcontrol.c

Merge remote-tracking branch 'input/next'

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

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

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

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

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

Conflicts:
drivers/gpu/drm/tegra/Kconfig

Merge remote-tracking branch 'drm-intel/for-linux-next'

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

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h

Merge remote-tracking branch 'crypto/master'

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

Merge remote-tracking branch 'bluetooth/master'

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

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
drivers/net/wireless/iwlwifi/pcie/drv.c

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

Conflicts:
net/xfrm/xfrm_policy.c

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

Conflicts:
arch/h8300/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h

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

Merge remote-tracking branch 'dlm/next'

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

Merge remote-tracking branch 'thermal/next'

Merge remote-tracking branch 'idle/next'

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

Conflicts:
drivers/i2c/i2c-core.c

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

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

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

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

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

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

Merge remote-tracking branch 'pci/next'

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

Conflicts:
fs/nfs/direct.c
fs/nfs/file.c

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

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

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

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

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

Merge remote-tracking branch 'logfs/master'

Merge remote-tracking branch 'gfs2/master'

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

Merge remote-tracking branch 'fscache/fscache'

Merge remote-tracking branch 'f2fs/dev'

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'ecryptfs/next'