Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
  fix do_sys_open() prototype
  sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
  Documentation: Fix typo in SubmitChecklist.
  Typo: depricated -> deprecated
  Add missing profile=kvm option to Documentation/kernel-parameters.txt
  fix typo about TBI in e1000 comment
  proc.txt: Add /proc/stat field
  small documentation fixes
  Fix compiler warning in smount example program from sharedsubtree.txt
  docs/sysfs: add missing word to sysfs attribute explanation
  documentation/ext3: grammar fixes
  Documentation/java.txt: typo and grammar fixes
  Documentation/filesystems/vfs.txt: typo fix
  include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
  trivial copy_data_pages() tidy up
  Fix typo in arch/x86/kernel/tsc_32.c
  file link fix for Pegasus USB net driver help
  remove unused return within void return function
  Typo fixes retrun -> return
  x86 hpet.h: remove broken links
  ...

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

diff --cc arch/i386/Kconfig
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/powernow-k6.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

diff --cc arch/x86/mach-voyager/voyager_smp.c
Simple merge

diff --cc arch/x86/mm/fault_32.c
Simple merge

diff --cc arch/x86/mm/fault_64.c
Simple merge

diff --cc drivers/ide/ide-tape.c
Simple merge

diff --cc drivers/ide/legacy/q40ide.c
Simple merge

diff --cc drivers/ide/pci/it821x.c
Simple merge

diff --cc drivers/ide/pci/siimage.c
Simple merge

diff --cc drivers/md/dm-crypt.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/wireless/ipw2100.c
Simple merge

diff --cc include/asm-x86/hpet.h
Simple merge