Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Fix common misspellings

diff --cc Documentation/edac.txt
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge

diff --cc Documentation/video4linux/bttv/Sound-FAQ
Simple merge

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

diff --cc arch/powerpc/kernel/head_64.S
Simple merge

diff --cc arch/powerpc/mm/tlb_low_64e.S
Simple merge

diff --cc arch/sparc/kernel/entry.S
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc block/blk-throttle.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-magicmouse.c
Simple merge

diff --cc drivers/macintosh/therm_pm72.c
Simple merge

diff --cc drivers/media/radio/wl128x/fmdrv_common.c
Simple merge

diff --cc drivers/net/atlx/atl2.c
Simple merge

diff --cc drivers/net/bonding/bond_alb.h
index 4b3e358,b3bc750..86861f0
--- 1/drivers/net/bonding/bond_alb.h
--- 2/drivers/net/bonding/bond_alb.h
+++ b/drivers/net/bonding/bond_alb.h
@@@ -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

diff --cc drivers/net/irda/via-ircc.c
Simple merge

diff --cc drivers/net/mlx4/mcg.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/usb/cdc_eem.c
Simple merge

diff --cc drivers/net/wireless/ath/carl9170/carl9170.h
Simple merge

diff --cc drivers/net/wireless/iwlegacy/iwl-core.c
Simple merge

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

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

diff --cc fs/notify/inotify/inotify_fsnotify.c
Simple merge

diff --cc include/drm/drm_crtc.h
Simple merge

diff --cc include/drm/ttm/ttm_bo_api.h
Simple merge

diff --cc include/drm/ttm/ttm_bo_driver.h
Simple merge

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

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

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

diff --cc include/sound/soc-dapm.h
Simple merge

diff --cc kernel/kexec.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sched_fair.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
Simple merge

diff --cc net/ceph/osd_client.c
Simple merge

diff --cc net/core/dev.c
Simple merge

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

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

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

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

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