Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
Linus Torvalds [Thu, 7 Apr 2011 18:14:49 +0000 (11:14 -0700)]
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Fix common misspellings

45 files changed:
1  2 
Documentation/edac.txt
Documentation/kernel-parameters.txt
Documentation/sound/alsa/ALSA-Configuration.txt
Documentation/video4linux/bttv/Sound-FAQ
arch/ia64/sn/kernel/irq.c
arch/powerpc/kernel/head_64.S
arch/powerpc/mm/tlb_low_64e.S
arch/sparc/kernel/entry.S
block/blk-core.c
block/blk-throttle.c
drivers/hid/hid-core.c
drivers/hid/hid-magicmouse.c
drivers/macintosh/therm_pm72.c
drivers/media/radio/wl128x/fmdrv_common.c
drivers/net/atlx/atl2.c
drivers/net/bonding/bond_alb.h
drivers/net/irda/via-ircc.c
drivers/net/mlx4/mcg.c
drivers/net/phy/phy_device.c
drivers/net/usb/cdc_eem.c
drivers/net/wireless/ath/carl9170/carl9170.h
drivers/net/wireless/iwlegacy/iwl-core.c
drivers/usb/serial/opticon.c
fs/btrfs/inode.c
fs/notify/inotify/inotify_fsnotify.c
include/drm/drm_crtc.h
include/drm/ttm/ttm_bo_api.h
include/drm/ttm/ttm_bo_driver.h
include/linux/fs.h
include/linux/perf_event.h
include/linux/skbuff.h
include/sound/soc-dapm.h
kernel/kexec.c
kernel/sched.c
kernel/sched_fair.c
kernel/signal.c
net/bluetooth/hci_core.c
net/bluetooth/l2cap_sock.c
net/ceph/osd_client.c
net/core/dev.c
net/ipv4/tcp_output.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c
sound/pci/hda/patch_realtek.c
sound/soc/codecs/tlv320dac33.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -74,9 -74,9 +74,9 @@@ struct tlb_client_info 
                                 * packets to a Client that the Hash function
                                 * gave this entry index.
                                 */
 -      u32 tx_bytes;           /* Each Client acumulates the BytesTx that
 +      u32 tx_bytes;           /* Each Client accumulates the BytesTx that
                                 * were tranmitted to it, and after each
-                                * CallBack the LoadHistory is devided
+                                * CallBack the LoadHistory is divided
                                 * by the balance interval
                                 */
        u32 load_history;       /* This field contains the amount of Bytes
Simple merge
Simple merge
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 kernel/kexec.c
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
diff --cc kernel/signal.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge