Merge branch 'for-next' into for-linus

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

diff --cc Documentation/filesystems/proc.txt
index 96a44dd,bb314f6..a4f30fa
--- 1/Documentation/filesystems/proc.txt
--- 2/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@@ -189,13 -188,7 +189,13 @@@ memory usage. Its seven fields are expl
  contains details information about the process itself.  Its fields are
  explained in Table 1-4.
  
 +(for SMP CONFIG users)
 +For making accounting scalable, RSS related information are handled in
 +asynchronous manner and the vaule may not be very precise. To see a precise
 +snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
 +It's slow but very precise.
 +
- Table 1-2: Contents of the statm files (as of 2.6.30-rc7)
+ Table 1-2: Contents of the status files (as of 2.6.30-rc7)
  ..............................................................................
   Field                       Content
   Name                        filename of the executable

diff --cc Documentation/power/runtime_pm.txt
Simple merge

diff --cc arch/arm/common/clkdev.c
Simple merge

diff --cc arch/arm/mach-davinci/include/mach/i2c.h
Simple merge

diff --cc arch/arm/mach-omap2/board-3630sdp.c
index 4386d2b,7390596..4386d2b
mode 100755,100644..100644
--- 1/arch/arm/mach-omap2/board-3630sdp.c
--- 2/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c

diff --cc arch/arm/mach-omap2/board-zoom-peripherals.c
index ca95d8d,1e3dfb6..ca95d8d
mode 100755,100644..100644
--- 1/arch/arm/mach-omap2/board-zoom-peripherals.c
--- 2/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c

diff --cc arch/arm/mach-u300/core.c
Simple merge

diff --cc arch/arm/mach-u300/include/mach/debug-macro.S
index ca4a028,d591fe1..92c1242
--- 1/arch/arm/mach-u300/include/mach/debug-macro.S
--- 2/arch/arm/mach-u300/include/mach/debug-macro.S
+++ b/arch/arm/mach-u300/include/mach/debug-macro.S
@@@ -10,8 -10,8 +10,8 @@@
   */
  #include <mach/hardware.h>
  
 -      .macro  addruart,rx
 +      .macro  addruart, rx, tmp
-       /* If we move the adress using MMU, use this. */
+       /* If we move the address using MMU, use this. */
        mrc     p15, 0, \rx, c1, c0
        tst     \rx, #1                 @ MMU enabled?
        ldreq   \rx,      = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address

diff --cc arch/ia64/sn/kernel/setup.c
Simple merge

diff --cc arch/s390/kernel/sclp.S
Simple merge

diff --cc arch/sparc/kernel/perf_event.c
Simple merge

diff --cc arch/x86/kernel/pci-dma.c
Simple merge

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc arch/x86/kernel/vmiclock_32.c
Simple merge

diff --cc crypto/Kconfig
Simple merge

diff --cc drivers/acpi/dock.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/ata/libata-sff.c
Simple merge

diff --cc drivers/ata/pata_acpi.c
Simple merge

diff --cc drivers/ata/pata_pcmcia.c
Simple merge

diff --cc drivers/char/agp/intel-agp.c
Simple merge

diff --cc drivers/char/hvc_iseries.c
Simple merge

diff --cc drivers/char/serial167.c
Simple merge

diff --cc drivers/char/tty_io.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_bios.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drv.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_state.c
Simple merge

diff --cc drivers/input/serio/i8042.c
Simple merge

diff --cc drivers/media/video/gspca/ov519.c
Simple merge

diff --cc drivers/mfd/sm501.c
Simple merge

diff --cc drivers/mmc/card/sdio_uart.c
Simple merge

diff --cc drivers/net/chelsio/sge.c
Simple merge

diff --cc drivers/net/cs89x0.c
Simple merge

diff --cc drivers/net/cxgb3/sge.c
Simple merge

diff --cc drivers/net/davinci_emac.c
Simple merge

diff --cc drivers/net/e1000e/82571.c
Simple merge

diff --cc drivers/net/e1000e/lib.c
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

diff --cc drivers/net/ks8851.c
Simple merge

diff --cc drivers/net/qlge/qlge_ethtool.c
index 05b8bde,b8d21ab..7dbff87
--- 1/drivers/net/qlge/qlge_ethtool.c
--- 2/drivers/net/qlge/qlge_ethtool.c
+++ b/drivers/net/qlge/qlge_ethtool.c
@@@ -404,9 -401,9 +404,9 @@@ static int ql_set_wol(struct net_devic
        if (!qdev->wol) {
                u32 wol = 0;
                status = ql_mb_wol_mode(qdev, wol);
 -              QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n",
 -                      (status == 0) ? "cleared successfully" : "clear failed",
 -                      wol, qdev->ndev->name);
 +              netif_err(qdev, drv, qdev->ndev, "WOL %s (wol code 0x%x)\n",
-                         status == 0 ? "cleared sucessfully" : "clear failed",
++                        status == 0 ? "cleared successfully" : "clear failed",
 +                        wol);
        }
  
        return 0;

diff --cc drivers/net/qlge/qlge_main.c
index c26ec5d,a35845b..fd34f26
--- 1/drivers/net/qlge/qlge_main.c
--- 2/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@@ -3853,10 -3516,9 +3853,10 @@@ int ql_wol(struct ql_adapter *qdev
        if (qdev->wol) {
                wol |= MB_WOL_MODE_ON;
                status = ql_mb_wol_mode(qdev, wol);
 -              QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n",
 -                      (status == 0) ? "Successfully set" : "Failed", wol,
 -                      qdev->ndev->name);
 +              netif_err(qdev, drv, qdev->ndev,
 +                        "WOL %s (wol code 0x%x) on %s\n",
-                         (status == 0) ? "Sucessfully set" : "Failed",
++                        (status == 0) ? "Successfully set" : "Failed",
 +                        wol, qdev->ndev->name);
        }
  
        return status;

diff --cc drivers/net/smsc9420.c
Simple merge

diff --cc drivers/net/spider_net.c
Simple merge

diff --cc drivers/net/sungem.c
Simple merge

diff --cc drivers/net/tehuti.c
Simple merge

diff --cc drivers/net/tokenring/tms380tr.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/typhoon.c
index e3ddcb8,d1a8068..2fbf152
--- 1/drivers/net/typhoon.c
--- 2/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@@ -2095,8 -2111,9 +2095,8 @@@ typhoon_tx_timeout(struct net_device *d
        struct typhoon *tp = netdev_priv(dev);
  
        if(typhoon_reset(tp->ioaddr, WaitNoSleep) < 0) {
 -              printk(KERN_WARNING "%s: could not reset in tx timeout\n",
 -                                      dev->name);
 +              netdev_warn(dev, "could not reset in tx timeout\n");
-               goto truely_dead;
+               goto truly_dead;
        }
  
        /* If we ever start using the Hi ring, it will need cleaning too */
@@@ -2104,8 -2121,9 +2104,8 @@@
        typhoon_free_rx_rings(tp);
  
        if(typhoon_start_runtime(tp) < 0) {
 -              printk(KERN_ERR "%s: could not start runtime in tx timeout\n",
 -                                      dev->name);
 +              netdev_err(dev, "could not start runtime in tx timeout\n");
-               goto truely_dead;
+               goto truly_dead;
          }
  
        netif_wake_queue(dev);

diff --cc drivers/net/ucc_geth.c
Simple merge

diff --cc drivers/net/wimax/i2400m/fw.c
Simple merge

diff --cc drivers/net/wireless/ath/ar9170/main.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2500usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00debug.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00dev.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00queue.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt61pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt73usb.c
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_mac.c
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge

diff --cc drivers/scsi/libfc/fc_fcp.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_els.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_scsi.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/usb/musb/musb_regs.h
Simple merge

diff --cc drivers/usb/serial/cypress_m8.c
Simple merge

diff --cc drivers/usb/serial/opticon.c
Simple merge

diff --cc drivers/usb/serial/symbolserial.c
Simple merge

diff --cc fs/binfmt_elf_fdpic.c
Simple merge

diff --cc fs/bio.c
Simple merge

diff --cc fs/cifs/cifssmb.c
Simple merge

diff --cc fs/ext3/super.c
Simple merge

diff --cc fs/ext4/mballoc.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/gfs2/ops_fstype.c
Simple merge

diff --cc fs/jbd/transaction.c
Simple merge

diff --cc fs/locks.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/nfsd/nfs4xdr.c
Simple merge

diff --cc fs/ocfs2/dlmglue.c
Simple merge

diff --cc fs/ocfs2/extent_map.c
Simple merge

diff --cc fs/reiserfs/bitmap.c
Simple merge

diff --cc fs/udf/inode.c
Simple merge

diff --cc include/linux/mmzone.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/irq/chip.c
Simple merge

diff --cc kernel/ksysfs.c
Simple merge

diff --cc kernel/params.c
Simple merge

diff --cc kernel/sched_cpupri.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc net/ipv4/tcp_timer.c
Simple merge

diff --cc net/mac80211/mesh_plink.c
Simple merge

diff --cc net/netfilter/nf_conntrack_sip.c
Simple merge

diff --cc net/netfilter/xt_hashlimit.c
Simple merge

diff --cc security/selinux/avc.c
Simple merge

diff --cc sound/pci/rme9652/hdspm.c
Simple merge

diff --cc sound/soc/codecs/wm8990.c
Simple merge

diff --cc tools/perf/perf.c
Simple merge