Merge branch 'master' into for-next
Jiri Kosina [Tue, 29 Jan 2013 09:48:30 +0000 (10:48 +0100)]
Conflicts:
drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

30 files changed:
1  2 
arch/powerpc/platforms/85xx/p1022_ds.c
arch/powerpc/platforms/86xx/mpc8610_hpcd.c
arch/xtensa/Kconfig
drivers/bluetooth/ath3k.c
drivers/devfreq/exynos4_bus.c
drivers/firewire/ohci.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/hid/Kconfig
drivers/isdn/mISDN/l1oip_core.c
drivers/media/platform/soc_camera/mx2_camera.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/mellanox/mlx4/en_main.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
drivers/pcmcia/rsrc_nonstatic.c
drivers/rpmsg/virtio_rpmsg_bus.c
drivers/scsi/Kconfig
drivers/staging/octeon/ethernet.c
drivers/target/sbp/sbp_target.c
fs/btrfs/extent-tree.c
fs/btrfs/relocation.c
fs/btrfs/transaction.c
fs/hpfs/inode.c
include/linux/dma-buf.h
net/bluetooth/hci_core.c
net/sctp/sm_make_chunk.c
sound/soc/codecs/ab8500-codec.c
sound/soc/codecs/wm8974.c
sound/soc/codecs/wm8978.c
sound/soc/codecs/wm8983.c
sound/soc/codecs/wm8985.c

Simple merge
Simple merge
@@@ -636,7 -658,7 +658,7 @@@ static int exynos4_bus_target(struct de
        if (old_freq == freq)
                return 0;
  
-       dev_dbg(dev, "targeting %lukHz %luuV\n", freq, opp_get_voltage(opp));
 -      dev_dbg(dev, "targetting %lukHz %luuV\n", freq, new_oppinfo.volt);
++      dev_dbg(dev, "targeting %lukHz %luuV\n", freq, new_oppinfo.volt);
  
        mutex_lock(&data->lock);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/hpfs/inode.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge